Max Neunhoeffer
|
f7e57a5b47
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
js/apps/system/aardvark/frontend/scss/generated.css
js/apps/system/aardvark/manifest.json
lib/Rest/EndpointIp.cpp
lib/Rest/EndpointUnixDomain.cpp
lib/V8/v8-utils.cpp
|
2014-02-21 15:28:21 +01:00 |
Jan Steemann
|
211b0da24b
|
moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer
|
2014-02-21 14:44:18 +01:00 |
Jan Steemann
|
fe7dde8909
|
more randomness for test
|
2014-02-11 09:38:43 +01:00 |
Jan Steemann
|
c38c038492
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
CHANGELOG
js/apps/system/aardvark/frontend/css/collectionsItemView.css
js/apps/system/aardvark/frontend/css/graphlayout.css
|
2014-02-06 13:18:52 +01:00 |
Jan Steemann
|
3e5b366021
|
make test directories more independent
|
2014-02-04 12:08:01 +01:00 |
Max Neunhoeffer
|
c3f01237b0
|
Implement replace and update on cluster.
This still has a freeing too early bug with TRI_json_t.
|
2014-01-28 16:49:44 +01:00 |
Jan Steemann
|
b1fccd1bb0
|
added tests for JSON hashing
|
2014-01-23 16:42:42 +01:00 |
Frank Celler
|
1c57332665
|
cleanup
|
2013-11-16 17:12:17 +01:00 |