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

2483 Commits

Author SHA1 Message Date
Jan Steemann 00d8a9023f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-21 17:40:38 +01:00
Jan Steemann 7a0aac82e2 re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Max Neunhoeffer 267ee74d9a Fix a namespace problem with a new file. 2014-02-21 16:11:00 +01:00
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 50b3ec2999 fixed compiler warnings 2014-02-21 14:45:15 +01:00
Max Neunhoeffer 91db141ea5 Change value of things in agency according to Sharding.md. 2014-02-21 13:19:57 +01:00
Jan Steemann 2e03f01a25 moved implementation of DBServerJob into own file 2014-02-21 09:09:21 +01:00
Jan Steemann 2f6f59e228 fixed startup race condition 2014-02-21 08:47:24 +01:00
Frank Celler 5a7880b037 added no request 2014-02-20 21:09:13 +01:00
Frank Celler c7c5576f18 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-20 21:02:37 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
 2014-02-20 21:02:07 +01:00
Frank Celler b427bad63a do not allow reset 2014-02-20 20:51:00 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Jan Steemann 13357cb846 made clear functions private 2014-02-20 17:33:56 +01:00
Jan Steemann 0480dbb404 added collection.revision() 2014-02-20 17:30:26 +01:00
Jan Steemann a820a74a6b added collection.figures() for sharded collections 2014-02-20 17:06:36 +01:00
Jan Steemann 9666407721 sped up property lookup for db 2014-02-20 12:52:41 +01:00
Jan Steemann ba8a1fb51f disallow key generators 2014-02-20 09:34:11 +01:00
Jan Steemann 4f48172323 some renames 2014-02-20 09:16:25 +01:00
Jan Steemann 82d84e92dd more sleeping 2014-02-19 18:33:11 +01:00
Jan Steemann d92dd90aac fixed instance race condition 2014-02-19 17:10:11 +01:00
Jan Steemann 4770fed362 removed dead code 2014-02-19 15:35:52 +01:00
Jan Steemann dd5b172e2c fixed race conditions 2014-02-19 14:55:21 +01:00
Frank Celler 726144ce39 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
 2014-02-19 14:30:46 +01:00
Frank Celler c779325b5d added frontend-development switch 2014-02-19 14:28:51 +01:00
Jan Steemann 66bc4c9a41 allow unique index creation on shard keys only 2014-02-19 10:30:41 +01:00
Jan Steemann 29f3e17eef extract real error number 2014-02-18 14:27:32 +01:00
Jan Steemann dc8e590bca inedges, outedges, edges 2014-02-18 13:46:09 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-18 08:50:27 +01:00
Frank Celler 57796c96d1 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 16:55:17 +01:00
Frank Celler c5d6e6a9d3 fixed rethrow 2014-02-17 16:54:03 +01:00
Max Neunhoeffer 640b7c1530 Start fixing post-database creation actions for coordinator. 2014-02-17 16:31:43 +01:00
Max Neunhoeffer 99df09decb Fix cmake entry for RestShutdownHandler 2014-02-17 16:30:23 +01:00
Max Neunhoeffer fd8ed72546 Add RestShutdownHandler.cpp to CMakeLists.txt 2014-02-17 14:37:31 +01:00
Max Neunhoeffer 064aec971e Get rid of template parameters for make_pair in one place. 2014-02-17 14:11:47 +01:00
Jan Steemann c40d930fa6 issue #765: added SLICE AQL function 2014-02-17 11:09:03 +01:00
Jan Steemann 89d96c6c3b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-14 18:47:59 +01:00
Jan Steemann ec0ad56f8e fix potentially dangerous function 2014-02-14 18:47:41 +01:00
Jan Steemann 3fd053eb1e updated tests 2014-02-14 18:44:36 +01:00
Frank Celler 65d7d8fdab Merge remote-tracking branch 'origin/devel' into sharding 2014-02-14 17:23:33 +01:00
Frank Celler ddfbe9d8f9 ignore helper files 2014-02-14 16:52:01 +01:00
Max Neunhoeffer 98ed29ab84 Make check for useDatabase switchable for unittests. 2014-02-14 15:33:35 +01:00
Esteban Lombeyda e958f6052a Icon Bug fix 2014-02-14 15:12:12 +01:00
Jan Steemann 87eba429fe updated documentation 2014-02-14 10:37:46 +01:00
Jan Steemann 0f0ef8a33f updated index docs 2014-02-14 10:30:05 +01:00
Jan Steemann 44dccf582c Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 18:14:59 +01:00
Jan Steemann f8476ce0b0 fixed tests 2014-02-13 18:14:53 +01:00
Frank Celler eb95f1bee9 added rethrow 2014-02-13 16:58:46 +01:00
Jan Steemann f2cd112bf5 index ids 2014-02-13 16:30:48 +01:00
Jan Steemann c9c8f4e62a added tests 2014-02-13 16:12:57 +01:00