1
0
Fork 0
Commit Graph

10463 Commits

Author SHA1 Message Date
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
Jan Steemann 6491a6797f fixed jslint warnings 2014-02-17 16:44:26 +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
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
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
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 a546f63714 fixed test 2014-02-17 09:56:27 +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
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 38cffe5401 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-14 16:52:13 +01:00
Frank Celler ddfbe9d8f9 ignore helper files 2014-02-14 16:52:01 +01:00
Heiko Kernbach 5a2a5508ef added new collection/model for notifications 2014-02-14 16:51:57 +01:00
Frank Celler 6d51527fb5 check for drive letter 2014-02-14 16:51:40 +01:00
Michael Hackstein 5cb9068719 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 16:36:08 +01:00
Michael Hackstein 86ae7ed443 Added a faked route to cluster js to receive the type of the network 2014-02-14 16:36:00 +01:00
scottashton 98a86abc98 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 16:33:56 +01:00
scottashton 631ff08dcc clusterFrontend 2014-02-14 16:33:33 +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
Max Neunhoeffer 3d27a9f0ad Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-14 14:44:45 +01:00
Max Neunhoeffer 076bc6e723 Cleanup socket abstraction for different OSes. 2014-02-14 14:44:27 +01:00
Frank Celler 6269c61aa7 Merge remote-tracking branch 'origin/devel' into sharding 2014-02-14 14:21:59 +01:00
Michael Hackstein e92f5ec5be Added svg and div into the showCluster template 2014-02-14 14:10:23 +01:00
scottashton 907f9127e9 starting clusterFrontend 2014-02-14 13:59:29 +01:00
Michael Hackstein 24d97170f9 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-14 13:40:53 +01:00
Michael Hackstein 00007a653f Fixed tests for cluster planner 2014-02-14 13:40:47 +01:00
Jan Steemann 710ce8efd1 updated and fixed documentation 2014-02-14 10:53:04 +01:00