1
0
Fork 0
Commit Graph

2131 Commits

Author SHA1 Message Date
jsteemann 366cb659af fixed wrong options 2016-04-22 12:36:58 +02:00
Frank Celler 5335a5b0af moved to Random 2016-04-21 22:53:20 -07:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
jsteemann f01c03a88e cppcheck 2016-04-20 21:39:19 +02:00
Jan Steemann 57e40aa328 properly handle --wal.sync-interval 2016-04-20 16:58:14 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
jsteemann a5bbb8d084 allow using a few more bytes for indexed slice values 2016-04-19 23:34:39 +02:00
jsteemann a3b154043e removed unused typedef 2016-04-19 22:31:12 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
Frank Celler 17cd890132 WIP 2016-04-16 20:29:33 -07:00
Michael Hackstein 35bd5c44e4 Removed TRI_json_t from Vocbase traverser. Still needs Json for serialisation of varNode 2016-04-16 23:48:18 +02:00
Michael Hackstein afdadcdfe5 Transformed getFilteredDocuments on Coordinator in ClusterMethods to use only VelocyPack 2016-04-16 22:39:52 +02:00
Frank Celler 22e116b143 fixed ambiguity 2016-04-15 23:02:28 -07:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Kaveh Vahedipour 1605310908 [[{"url":"test","op":12,"ttl":6}]] broke agency 2016-04-15 16:41:33 +02:00
Kaveh Vahedipour e3dbb4f9b6 [[{url:test,op:12,ttl:6}]] broke agency 2016-04-15 16:31:00 +02:00
Kaveh Vahedipour 97a6c29ec6 [[{url:test,op:12,ttl:6}]] broke agency 2016-04-15 16:29:44 +02:00
Michael Hackstein 5645d77d22 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-15 15:40:04 +02:00
Max Neunhoeffer 4dfa9c57f6 FIx compilation. 2016-04-15 15:23:46 +02:00
Max Neunhoeffer 8490606317 Add a warning about shared folders. 2016-04-15 13:48:51 +02:00
Michael Hackstein 3434be7b7a Implemented documents baby variant for cluster and also improved the baby tests. ALl errors will now have exactly one representation for each baby document even if they could be identified earlier. 2016-04-14 17:40:28 +02:00
Michael Hackstein 2d860fb80e Added a cpp file for AqlTransaction. Now only parts of AQL have to be rebuild on cluster changes, not complete AQL 2016-04-14 11:30:54 +02:00
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Michael Hackstein b043b103e0 Optimized IN in AQL pattern Matcher properly. Also added some tests for it 2016-04-13 14:49:21 +02:00
Michael Hackstein 8760f10354 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-12 08:01:40 +02:00
Jan Steemann a7e2d783ee enable copy elision 2016-04-11 18:05:43 +02:00
Frank Celler 922753ef3d WIP 2016-04-11 17:44:41 +02:00
Michael Hackstein 474f70c9ad Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-11 16:33:08 +02:00
Jan Steemann 7c934b43e9 updated library 2016-04-11 13:27:21 +02:00
Michael Hackstein b9a51d3d59 Removed dead code in ExampleMatcher (Json Variant) 2016-04-10 14:15:04 +02:00
jsteemann 13345cb50a pacify valgrind 2016-04-08 23:40:29 +02:00
Frank Celler d24f63e8e2 added upgrade feature 2016-04-08 15:39:36 +02:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Jan Steemann 1855b74aaa added asserts 2016-04-07 16:44:36 +02:00
Frank Celler 58b9cf7e91 WIP 2016-04-07 15:40:11 +02:00
Jan Steemann 9e9c1ab8d5 stringify SSL opts 2016-04-07 12:59:38 +02:00
Jan Steemann 545b87cb76 test fixes 2016-04-06 17:39:24 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Jan Steemann 18204c57e8 fixed replication tests 2016-04-06 09:41:31 +02:00
Jan Steemann d0f368445a replication fixes 2016-04-05 18:32:09 +02:00
Max Neunhoeffer 6dc128c22a Be tolerant in remove() with isRestore==true and no rev given. 2016-04-05 13:06:09 +02:00
Max Neunhoeffer b4137d2fc6 Make remove respect isRestore flag. 2016-04-05 10:39:23 +02:00
Max Neunhoeffer b1963d2cee Fix replication in the sense that revs are now copied over. 2016-04-05 10:27:43 +02:00
Frank Celler 5cab4cffac WIP 2016-04-04 15:23:25 +02:00
Michael Hackstein bf76988267 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-04 12:52:27 +02:00
Michael Hackstein ab46b07f98 Reimplemented Traversal in Cluster case 2016-04-04 12:52:11 +02:00
Jan Steemann ba9dce75f4 fixed some replication tests 2016-04-04 12:26:30 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00