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

10493 Commits

Author SHA1 Message Date
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
Michael Hackstein c4b14fcfac Added strong transparency to colors, used by tiles. Also added some more attributes to tile, still some overwrites found there 2014-02-17 22:16:09 +01:00
Michael Hackstein 36affeb5d7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-17 21:32:27 +01:00
Max Neunhoeffer b99e14b43b Add single test. 2014-02-17 18:09:14 +01:00
Max Neunhoeffer 8f6ae0c088 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-17 17:47:40 +01:00
Max Neunhoeffer aa0f4960fd Add boost test to JS test suite. 2014-02-17 17:47:20 +01:00
Jan Steemann 23c303da43 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 17:46:07 +01:00
Jan Steemann 73aa8226e3 geo query 2014-02-17 17:46:02 +01:00
Max Neunhoeffer 8ff2964c63 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/server/modules/org/arangodb/testing.js
 2014-02-17 17:24:33 +01:00
Max Neunhoeffer c567ea90c7 Add unittests_config target to JS testing framework. 2014-02-17 17:07:53 +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
Heiko Kernbach 286bcc658a notification prep. + karma fix 2014-02-17 16:46:15 +01:00
Jan Steemann 6491a6797f fixed jslint warnings 2014-02-17 16:44:26 +01:00
gschwab cecb40147d path fixed 2014-02-17 16:43:13 +01:00
Jan Steemann 05e59bae7b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 16:41:21 +01:00
Jan Steemann 9f16760359 simple query range 2014-02-17 16:41:10 +01:00
Max Neunhoeffer bc99b765d0 Add wait argument to statusExternal. 
Windows version untested.
 2014-02-17 16:40:11 +01:00
Heiko Kernbach ee6fb3c2e6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-17 16:38:00 +01:00
Heiko Kernbach 899fa52876 added api-cmd for getting a complete user list 2014-02-17 16:37:50 +01:00
Max Neunhoeffer 640b7c1530 Start fixing post-database creation actions for coordinator. 2014-02-17 16:31:43 +01:00
Jan Steemann b8381603d7 fixed invalid assignment 2014-02-17 16:31:22 +01:00
Max Neunhoeffer 05a8a91929 Reactivate some stuff for coordinator, not yet actually called. 2014-02-17 16:31:13 +01:00
Max Neunhoeffer 99df09decb Fix cmake entry for RestShutdownHandler 2014-02-17 16:30:23 +01:00
Frank Celler 9c4dafebf1 put into separat scripts to hunt down travis problems 2014-02-17 16:12:29 +01:00
Max Neunhoeffer c2cb8c20cb Fix casting bug. 2014-02-17 14:45:47 +01:00
Max Neunhoeffer fd8ed72546 Add RestShutdownHandler.cpp to CMakeLists.txt 2014-02-17 14:37:31 +01:00
Max Neunhoeffer 75eff02608 Please the compiler under Windows. 2014-02-17 14:27:46 +01:00
Max Neunhoeffer dd3546ee40 Resolve socket bug under Windows. 2014-02-17 14:21:47 +01:00
Max Neunhoeffer e031c37b2d Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-17 14:14:51 +01:00
Max Neunhoeffer e815cc2ae5 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 14:12:32 +01:00
Max Neunhoeffer 064aec971e Get rid of template parameters for make_pair in one place. 2014-02-17 14:11:47 +01:00
Max Neunhoeffer 510c57aacc Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-17 14:05:33 +01:00
Max Neunhoeffer 568edcb8fb New test function. 2014-02-17 14:05:17 +01:00
Max Neunhoeffer 70b1f7a330 Do not compile in SIGCHLD handling for libev. 2014-02-17 14:04:33 +01:00
Michael Hackstein df7dfc0b10 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
 2014-02-17 13:50:06 +01:00
scottashton 7c12ac72f1 scss for cluster 2014-02-17 13:47:42 +01:00
scottashton 279a0c8f43 cluster 2014-02-17 13:42:01 +01:00
Michael Hackstein ae2ce12a45 Added a collect by address for dbServers and coordinators to show them based on their machine 2014-02-17 13:40:24 +01:00
scottashton d7a56eea77 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 13:38:01 +01:00
Heiko Kernbach c9193d153f removed obsolesce test 2014-02-17 11:55:22 +01:00
Heiko Kernbach 238396e3c4 prep for new notifications, cleanup 2014-02-17 11:47:58 +01:00
Jan Steemann 5c13019522 added tests 2014-02-17 11:37:49 +01:00
Jan Steemann 25b622aab1 fixed jslint warnings 2014-02-17 11:21:01 +01:00
Jan Steemann c40d930fa6 issue #765: added SLICE AQL function 2014-02-17 11:09:03 +01:00
Jan Steemann a546f63714 fixed test 2014-02-17 09:56:27 +01:00
gschwab 067a202104 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-17 08:57:27 +01:00
gschwab 5e90b2fe04 added user and statistic view (fakey and inactive) 2014-02-17 08:57:17 +01:00
scottashton b5950f1fd9 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 08:21:58 +01:00
scottashton dc4714538c cluster View 2014-02-17 08:21:55 +01:00