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

4025 Commits

Author SHA1 Message Date
Michael Hackstein 4d9c8ff9d9 Implemented creation of sharded collections 2014-03-04 13:22:47 +01:00
Michael Hackstein 181c7b72ff Added select2 library and selct box 2014-03-04 13:22:11 +01:00
gschwab 7a27b61583 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 12:28:48 +01:00
gschwab 4358ed553f deleted inline css 2014-03-04 12:28:43 +01:00
scottashton 44ab5d1398 new method admin/history to fetch the statistics history for single arango, coordinator and dbserv 2014-03-04 12:05:00 +01:00
gschwab 66e8d281fb deleted some unused css, preparing for migration to scss 2014-03-04 11:57:34 +01:00
gschwab 4522443ef8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 11:35:30 +01:00
gschwab 17e34003d5 fixed tooltips 2014-03-04 11:35:25 +01:00
Jan Steemann 373c44e78b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 10:40:25 +01:00
Jan Steemann 92c9760cf3 added documentation 2014-03-04 10:40:17 +01:00
Frank Celler 1237ce544d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-04 10:35:32 +01:00
Frank Celler 5c816ec808 added clusterId in statistics 2014-03-04 10:30:17 +01:00
gschwab dde0e3dbad fixed tooltips 2014-03-04 10:15:15 +01:00
gschwab 4a6d2fc0cc changed css from class 'btn*' to corresponding class 'button*' 2014-03-04 09:45:26 +01:00
gschwab fcf5536053 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 09:38:10 +01:00
gschwab 2bacbb8d8b changed css-class from 'btn btn-close' to 'button-close' and added toggle for class 'activated' for toggle-buttons 2014-03-04 09:38:04 +01:00
Michael Hackstein 3fe7b5d75d Fixed style of GUI button and made Coordinator Icon clickable 2014-03-04 09:20:37 +01:00
Michael Hackstein 3ec843ed62 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-04 09:15:39 +01:00
Michael Hackstein 182fd37a43 Styled gui button for cluster overview 2014-03-04 09:15:36 +01:00
gschwab 60bf913bfc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-04 09:07:50 +01:00
gschwab 28deb1751a fixed wrong url from 'index.html' to 'standalone.html' 2014-03-04 09:07:45 +01:00
Michael Hackstein dc6882ffec Style fixes 2014-03-04 09:02:00 +01:00
Michael Hackstein 852f7d4ac2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-04 08:58:24 +01:00
Michael Hackstein 3783f21734 Fixed a bug when deleting the cluster plan 2014-03-04 08:58:21 +01:00
Jan Steemann 8815dfe288 jslint 2014-03-04 08:38:43 +01:00
gschwab 1e05c97a61 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 18:21:30 +01:00
gschwab 3f1f4d7344 added class for activated buttons, added to collections view 2014-03-03 18:21:23 +01:00
scottashton 2aa5ffa270 added missing files 2014-03-03 18:19:43 +01:00
scottashton 90e18f40d2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 18:18:27 +01:00
gschwab 7b31ea6f43 added confirmation dialogs for editing and deleting cluster plans 2014-03-03 17:20:30 +01:00
scottashton c99b2c52ab removed no longer needed logs 2014-03-03 15:45:37 +01:00
scottashton 09e5069ec8 cleaned up merge mess 2014-03-03 15:24:10 +01:00
gschwab cedc1cf591 fixed routing problem after cancelling plannig a cluster 2014-03-03 15:19:20 +01:00
gschwab 702eeb90e8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 15:18:30 +01:00
gschwab 908e691205 fixed routing problem after cancelling plannig a cluster 2014-03-03 15:17:31 +01:00
scottashton 6c3a3717d0 fixed cluster chart 2014-03-03 15:12:11 +01:00
Michael Hackstein dc7a4c21a9 Fixed start and stop updating when clicking on DBServer Dashboards 2014-03-03 14:34:03 +01:00
Michael Hackstein 5af6f55f9c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-03 14:13:43 +01:00
Michael Hackstein 24f98d69db Fixed a bug where it was not posible to shutdown a cluster, change the plan and restart it without reloading 2014-03-03 14:13:40 +01:00
gschwab 17554866fd fixed problem with disappearing css class after rerender in ClusterView 2014-03-03 13:46:30 +01:00
gschwab e34579764f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 12:46:22 +01:00
gschwab 47917c403e modal background will be darker with waitModal 2014-03-03 12:46:18 +01:00
Jan Steemann a4451d3459 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 12:03:51 +01:00
Jan Steemann 32fe5cf684 updated api-docs 2014-03-03 12:03:33 +01:00
gschwab 04a7a047e0 background set to transparent and color to white for waitModal dialog 2014-03-03 12:01:46 +01:00
Michael Hackstein 9ec7a10a4c The user now gets a dialog while shutting down the cluster 2014-03-03 11:54:14 +01:00
Michael Hackstein 2f9124afb5 Fixed dbserver as modal dialog, shutdown cluster button now seems to be working better 2014-03-03 11:35:38 +01:00
Michael Hackstein 057a506a34 Fixed indention 2014-03-03 11:25:51 +01:00
Michael Hackstein d1c0ce6074 Removed 'back to cluster' button from modal dialog 2014-03-03 11:24:48 +01:00
Michael Hackstein cfef689512 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-03 11:04:08 +01:00
Michael Hackstein 6d3441ec87 Resizing of Application image now works again 2014-03-03 11:04:02 +01:00
Jan Steemann 65bc5dddad documentation 2014-03-03 10:40:29 +01:00
Jan Steemann 1481ceba42 documentation 2014-03-03 10:28:38 +01:00
Michael Hackstein bc8626ccd8 In a multi server setup the shardcounter is now default 0 2014-03-03 09:53:37 +01:00
Michael Hackstein fff19e4c49 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-03 09:50:01 +01:00
Michael Hackstein 472c755f43 Added Style for close button 2014-03-03 09:49:58 +01:00
Jan Steemann 09a1f3245e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-03 09:47:28 +01:00
scottashton 34cb636db9 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-03 09:47:21 +01:00
scottashton 573a9eadf9 added resize functionality for modal and single chart 2014-03-03 09:47:16 +01:00
Jan Steemann a3db6e7fc8 print error if user cannot be added 2014-03-03 09:46:04 +01:00
Michael Hackstein 3d80d931f4 The webinterface will now call home, display of new version to be implemented 2014-03-03 09:36:14 +01:00
Jan Steemann cfc0ebf904 fixed jslint warnings 2014-03-03 08:51:17 +01:00
Frank Celler 33b15d7660 release version 2.0.0-rc1 2014-03-02 08:06:31 +01:00
Frank Celler a8e0e1a9e4 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-03-02 07:52:25 +01:00
Michael Hackstein 5ff83d8e49 Added database icon svg 2014-03-01 22:08:25 +01:00
Michael Hackstein 0dffe98b6b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-01 22:07:51 +01:00
Michael Hackstein 7940a3cf01 Fixed shutdownbutton size and moved icons for coordinators and db servers 2014-03-01 22:07:49 +01:00
Claudius Weinberger 6a02c5a75a some UI changes 2014-03-01 22:06:24 +01:00
Claudius Weinberger b712f906bc some UI changes 2014-03-01 22:04:48 +01:00
Michael Hackstein 00b504301d Updated Coordinator icon 2014-03-01 20:55:19 +01:00
Michael Hackstein e920fece2a Added a server shutdown button to the navigation bar and created a modal view fpr the dashboard. NOt used yet due to problems with statistics in modals 2014-03-01 20:35:44 +01:00
Michael Hackstein 44397b9bce Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-01 20:34:52 +01:00
Michael Hackstein 28d4e2c1f8 Added cancel buttons to plan selectors and reverted to simple view for dashboard with added back button and back-button in browser working 2014-03-01 20:34:45 +01:00
Michael Hackstein 7a93757a16 Added a cancel button to all plans 2014-03-01 18:43:17 +01:00
Michael Hackstein 992dbf828d Fixed a type in bootstrap 2014-03-01 18:37:16 +01:00
Michael Hackstein 374223a00f Fixed navigation in cluster overview 2014-03-01 18:36:58 +01:00
Frank Celler f62c3f3678 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-03-01 18:14:18 +01:00
Frank Celler cdf635d5c6 added residentSizePercent 2014-03-01 18:14:14 +01:00
Michael Hackstein 5b093918e6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-01 17:33:39 +01:00
Michael Hackstein 2a796630bd Removed unused import 2014-03-01 17:33:34 +01:00
Michael Hackstein bfa6e46b4a Updated dashboard and removed headerbar 2014-03-01 17:32:46 +01:00
Frank Celler e70c9bed21 added total memory for mac 2014-03-01 17:16:10 +01:00
Frank Celler cff606d6ab Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-03-01 16:14:43 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Michael Hackstein dcb022a915 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-03-01 15:47:27 +01:00
Claudius Weinberger c7f6315ffe Dashboard changes 2014-03-01 15:46:41 +01:00
Michael Hackstein c79215d71f If a user now clicks on a coordinator hewill be redirected to normal Admin Interface 2014-03-01 15:46:00 +01:00
Claudius Weinberger 17ee3ef0ac some UI changes 2014-03-01 14:20:12 +01:00
Michael Hackstein 799f443b2f Heartbeats are now interpreted the new way 2014-03-01 14:07:58 +01:00
Michael Hackstein 59c597061c Fixed a check in the clusterPlan, a plan is now propoerly identified as test, symmetric or asymmetric 2014-03-01 13:41:36 +01:00
Michael Hackstein 8d8b1a12fd Fix relocation of hash information on startup of cluster interface 2014-03-01 13:18:24 +01:00
Michael Hackstein b34b2b17b9 The Plan is now thrown away after deleting it and not maintained locally in the browser 2014-03-01 13:17:49 +01:00
Michael Hackstein 16ac2c7fe9 The cluster history is also loaded now yeeeehaaaww 2014-02-28 23:33:37 +01:00
Frank Celler 05e30a6b3e release version 2.0.0-beta2 2014-02-28 23:27:58 +01:00
Frank Celler b849050e5a Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-02-28 23:21:11 +01:00
Michael Hackstein af9541edbc Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 23:20:08 +01:00
Michael Hackstein 017c15638e Fixed all routes for the geraffelige dashboard reload in cluster 2014-02-28 23:19:57 +01:00
Jan Steemann b66cdd6ff9 trying to fix test 2014-02-28 22:19:55 +01:00
Claudius Weinberger 515f46ebfb Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 21:16:08 +01:00
Claudius Weinberger dbb601bbab change notification color 2014-02-28 21:15:47 +01:00
Jan Steemann 078209edc5 changed messages 2014-02-28 20:59:46 +01:00
Frank Celler c2706fd737 release version 2.0.0-beta1 2014-02-28 20:44:44 +01:00
Max Neunhoeffer a264b55f32 Fight zombies. 2014-02-28 20:24:42 +01:00
Michael Hackstein d6d4fc95e4 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 19:55:12 +01:00
Max Neunhoeffer 375288d11f Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 19:54:26 +01:00
Max Neunhoeffer b114042e28 Add trampoline for DBserver statistics. 2014-02-28 19:54:13 +01:00
Michael Hackstein 41fc851b81 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 19:51:44 +01:00
gschwab 849c32508d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 19:51:39 +01:00
gschwab 4c3102935b edit plan for multi cluster added 2014-02-28 19:51:27 +01:00
Michael Hackstein 9b621c127e Created Databases and Collections are now updated properly 2014-02-28 19:43:11 +01:00
scottashton feae7c9e97 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 19:02:25 +01:00
scottashton edef8592b7 sharedClusterView refactoring 2014-02-28 19:02:09 +01:00
Jan Steemann 894c443f75 fixed jslint warnings 2014-02-28 18:58:02 +01:00
Jan Steemann 5ce618ca96 fixed jslint warnings 2014-02-28 18:53:58 +01:00
Jan Steemann 7070f3eef5 fixed jslint warnings 2014-02-28 18:48:52 +01:00
Jan Steemann 3ca2001c99 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 18:43:36 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
gschwab 7201d953e3 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 18:29:09 +01:00
gschwab 5102857ea4 fixed checkbox problem with reading value 2014-02-28 18:26:24 +01:00
Max Neunhoeffer b3a7173808 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 18:01:31 +01:00
Max Neunhoeffer b156e93293 Take out 2 tests involving transactions of cluster tests. 2014-02-28 18:01:04 +01:00
Claudius Weinberger bbc81f92a8 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 17:47:20 +01:00
Michael Hackstein ff17b1303d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 17:31:51 +01:00
Michael Hackstein 81a08bf66d Implemented redirecter for index.html 2014-02-28 17:31:46 +01:00
gschwab 24e23f9a7b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 17:10:03 +01:00
gschwab 225d1297f1 fixed multicluster bug 2014-02-28 17:09:57 +01:00
Claudius Weinberger 3a7beaf832 a few changes at the navigationbar 2014-02-28 16:34:30 +01:00
Max Neunhoeffer ab04e19702 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 16:27:00 +01:00
Max Neunhoeffer 1c2858f80a Hand on authorization header in dispatcher and planner action. 2014-02-28 16:26:34 +01:00
gschwab baf0e25448 provided model as argument 2014-02-28 15:58:31 +01:00
Max Neunhoeffer 75890f183a Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 15:38:51 +01:00
Max Neunhoeffer 7544adcc8d Fix JS testing framework with new path setup. 2014-02-28 15:38:25 +01:00
gschwab 0ec595162f pimped clusterDown view 2014-02-28 15:37:35 +01:00
Michael Hackstein fa8995a903 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 15:13:22 +01:00
Michael Hackstein 7ab394c7ad Removed relinking of index to cluster 2014-02-28 15:13:19 +01:00
Max Neunhoeffer 423bec9a2b Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 15:11:18 +01:00
Max Neunhoeffer f3095dbaf7 Servers in cluster are not themselves dispatchers. 2014-02-28 15:10:42 +01:00
Michael Hackstein e3dc0f29e2 The interfaces will now redirect based on their arangos rule: Dispatchers point to cluster.html, all others point to index.html 2014-02-28 15:01:38 +01:00
Max Neunhoeffer 9939b46a16 Disable dispatcher on servers in cluster. 2014-02-28 14:56:28 +01:00
Max Neunhoeffer 6393030f20 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 14:43:45 +01:00
Max Neunhoeffer c358c677b0 Fix typo. 2014-02-28 14:43:35 +01:00
Michael Hackstein d683c30b2f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 14:32:56 +01:00
Michael Hackstein c6e644a07a THe Cluster planner will now always point to base path independent of bookmarks. So it is not possible that events are not set 2014-02-28 14:32:51 +01:00
scottashton 6c4bbd28c8 added dashboard to showClusterView 2014-02-28 14:32:43 +01:00
scottashton edb061aa90 added dashboard to showClusterView 2014-02-28 14:31:17 +01:00
Michael Hackstein be9bfd0244 Removed debug console logs 2014-02-28 14:23:10 +01:00
Michael Hackstein 11d65be9f1 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 14:20:31 +01:00
Michael Hackstein 94c43cceba DBServer/Coordinator Stati are now updated properly 2014-02-28 14:20:25 +01:00
Max Neunhoeffer 0a8555fab3 Sort out path to javascript files. 2014-02-28 14:19:04 +01:00
Michael Hackstein 799fc918ef Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:52:28 +01:00
Michael Hackstein bc40cc5113 Started to fix rerendering / reloading bug in cluster dashboard 2014-02-28 13:52:13 +01:00
Jan Steemann 4615310e97 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:50:56 +01:00
Jan Steemann fd08bb0feb use indexes in AQL 2014-02-28 13:50:39 +01:00
Michael Hackstein 4c2e021254 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:47:02 +01:00
Michael Hackstein cd92c69d8a Fixed route to plan and start clusters 2014-02-28 13:46:44 +01:00
gschwab c8c2df0f07 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:34:34 +01:00
gschwab 07bc9128b9 global wait dialog for long-time operations 2014-02-28 13:34:18 +01:00
Max Neunhoeffer 0dec16279c Fix missing require for base64Encode. 2014-02-28 13:17:32 +01:00
Max Neunhoeffer c342713481 Create logPath directory in kickstarter if not already there. 2014-02-28 12:28:05 +01:00
Max Neunhoeffer eb62ca7f54 Fix name. 2014-02-28 12:19:19 +01:00
Max Neunhoeffer d201cdbd03 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 12:16:13 +01:00
Max Neunhoeffer 454f86ef01 New setup of paths on cluster kickstarter. 2014-02-28 12:15:31 +01:00
Michael Hackstein 543a65a5e0 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 12:09:20 +01:00
Michael Hackstein 352ccf903f Fixed js error in kickstarter 2014-02-28 12:09:08 +01:00
Frank Celler f22f1525d2 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	etc/relative/arangod.conf
 2014-02-28 12:03:11 +01:00
Frank Celler 9a410a5b71 added config for server state 2014-02-28 12:02:21 +01:00
Max Neunhoeffer 0ede95adb8 Hand on authorization information to other dispatchers. 2014-02-28 11:49:43 +01:00
Max Neunhoeffer 05055f3d5d Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 11:41:01 +01:00
gschwab 4340d7e2bb renamed button from 'Create Cluster' to 'Launch Cluster' 2014-02-28 11:11:23 +01:00
gschwab 1291e7e0d2 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 11:09:27 +01:00
gschwab 87c44e49c0 changed icon, its size and position 2014-02-28 11:09:18 +01:00
Jan Steemann c4cfe7a2ea fixed AQL geo queries 2014-02-28 10:26:31 +01:00
Max Neunhoeffer 10aec4ec4d Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 10:00:14 +01:00
gschwab 6b5ef57249 changed images for different cluster scenarios and changed default values for single machine 2014-02-28 09:56:54 +01:00
Jan Steemann b79313e697 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 09:56:53 +01:00
Jan Steemann e505a99a4e fixed fulltext query 2014-02-28 09:56:44 +01:00
gschwab ca00b64133 changed order of cluster scenarios 2014-02-28 09:51:09 +01:00
gschwab 7981eed626 buttons and corresponding functionality deleted 2014-02-28 09:48:19 +01:00
Michael Hackstein 9cfc2dbfb6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/routers/clusterRouter.js
 2014-02-28 09:39:07 +01:00
Michael Hackstein d403e69486 Fixed relaunch and shutdown and dsiplay of testPlan if a plan is existent and loading 2014-02-28 09:38:25 +01:00
Max Neunhoeffer b61dfa3c12 Cleanup results of launch and friends in kickstarter. 
Add allowAgents option for dispatchers.
 2014-02-28 09:31:16 +01:00
Jan Steemann 65feb43294 adjusted test expectations 2014-02-28 09:29:52 +01:00
Jan Steemann c04377e4cd Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 08:59:48 +01:00
Frank Celler cb15de59f7 Merge branch '2.0' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 22:41:06 +01:00
Frank Celler 08ed329ae6 removed wrong app 2014-02-27 22:02:58 +01:00
Jan Steemann 78b4f712f2 temporarily disable failing assertion 2014-02-27 20:12:17 +01:00
Frank Celler d0a1e6b123 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-02-27 18:50:38 +01:00
Jan Steemann 8897f2e040 fixed jslint warnings 2014-02-27 18:03:28 +01:00
Jan Steemann e9c6f17594 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 17:45:31 +01:00
Jan Steemann 897d6f4dcd fixed cluster authentication 2014-02-27 17:45:03 +01:00
scottashton ef0ba2c800 created new dashboard route in showClusterView 2014-02-27 17:44:15 +01:00
scottashton c8856ab3f6 created new dashboard route in showClusterView 2014-02-27 17:41:15 +01:00
Frank Celler f9d1562c5e Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-02-27 17:38:52 +01:00
scottashton 616dd60028 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 17:12:33 +01:00
gschwab 89c784361c handle cluster shutdown 2014-02-27 17:12:30 +01:00
scottashton a0fbfeba19 added dashboard view to cluster 2014-02-27 17:12:28 +01:00
gschwab 001551dc9e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 16:52:24 +01:00
gschwab 5eca05b858 shutdown action added 2014-02-27 16:52:19 +01:00
Frank Celler 9a6d2e3f84 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-02-27 16:51:18 +01:00
Michael Hackstein 73bf22a285 Routes to cluster collections and shards are now fixed and updated 2014-02-27 16:48:41 +01:00