Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
28,771 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

851 Commits

Author SHA1 Message Date
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Andreas Streichardt 95a6540c2e Fix core dump windows stuff 2016-04-19 18:11:18 +02:00
Max Neunhoeffer 4beb3deac8 New agency test. 2016-04-19 14:43:35 +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
Alan Plum 777848472d
standalone.html -> index.html 2016-04-18 18:01:05 +02:00
Michael Hackstein 75015da169 Fixed JSLint 2016-04-18 13:43:09 +02:00
Michael Hackstein 4cf47bf9c4 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-18 12:42:00 +02:00
Michael Hackstein 7fd765555a Fixed Cluster Client tests for Babies 2016-04-18 10:04:04 +02:00
Frank Celler b71185c7e9 WIP 2016-04-17 20:49:59 -07:00
Frank Celler 3a0ea3aecd WIP 2016-04-16 22:21:32 -07:00
Frank Celler de092a3885 single execute only 2016-04-16 21:01:07 -07:00
Frank Celler 17cd890132 WIP 2016-04-16 20:29:33 -07:00
Frank Celler cf416c686c WIP 2016-04-16 18:44:10 -07:00
Frank Celler 9d26ab1bbc WIP 2016-04-16 17:39:20 -07:00
Frank Celler 040104ebb5 WIP 2016-04-17 00:54:18 +02:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07: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
Michael Hackstein 4838eba64e Added a large timeout to upgrade database in test case 2016-04-15 15:39:50 +02:00
Max Neunhoeffer a4a8888e54 Sort out cluster test shutdown. 2016-04-15 15:20:28 +02:00
Michael Hackstein 59f7d1ec70 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-15 08:25:05 +02:00
Frank Celler 6c0ebb1637 WIP 2016-04-14 21:46:28 -07:00
Max Neunhoeffer cac003a0f4 Take out trace log in testing.js 2016-04-15 00:13:48 +02:00
Frank Celler b2b5fbb62d WIP 2016-04-14 14:02:07 -07:00
Max Neunhoeffer dab12cbeed Take out a debugging message. 2016-04-14 20:20:56 +02:00
Michael Hackstein 2f5910f828 Removed debug output and deactivated TRACE log level during tests 2016-04-14 20:15:26 +02:00
Kaveh Vahedipour f9716fee62 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 16:41:18 +02:00
Kaveh Vahedipour 393b068ac4 store's operator handling 2016-04-14 16:40:25 +02:00
Andreas Streichardt 3160b3cccb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 15:30:34 +02:00
Andreas Streichardt 10461fe369 Fix cluster shutdown time 2016-04-14 15:30:19 +02:00
Kaveh Vahedipour 05db051950 agency test for assigning objects through op set new ttl 2016-04-14 14:34:15 +02:00
Michael Hackstein bce15b7345 Actually deactivated the agency.wait-for-sync for tests. 2016-04-14 09:04:26 +02:00
Andreas Streichardt 7b90f3040c parallelize cluster instance startup during test 2016-04-12 14:10:38 +02:00
Kaveh Vahedipour c949df2dfc agency compiles after pull from devel 2016-04-08 12:40:38 +00:00
Kaveh Vahedipour a315997617 callback redesign 2016-04-07 10:20:08 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Kaveh Vahedipour 57619d105c new document api 2016-04-06 13:43:31 +02:00
Jan Steemann f45b6eeb49 jslint 2016-04-06 09:50:39 +02:00
Andreas Streichardt c2cf4be4e0 Remove etcd 2016-04-05 18:41:37 +02:00
Jan Steemann d0f368445a replication fixes 2016-04-05 18:32:09 +02:00
Andreas Streichardt d2d7af67fe Kickstarter and planner are dead 2016-04-05 17:45:39 +02:00
Andreas Streichardt bad100312f fix testing 2016-04-05 14:16:48 +02:00
Andreas Streichardt 529199a9c3 streamline error log handling 2016-04-05 13:35:48 +02:00
Andreas Streichardt d46fba735b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-05 12:19:10 +02:00
Andreas Streichardt 0ac34f174a Fix agency test invocation 2016-04-05 12:18:53 +02:00
Jan Steemann 368f7e7f69 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-05 11:29:58 +02:00
Jan Steemann 19c06e01dd fixed wrong text 2016-04-05 11:29:41 +02:00
Andreas Streichardt 6554cd9cee Fix dumpand restore stuff 2016-04-05 10:31:33 +02:00