1
0
Fork 0
Commit Graph

9643 Commits

Author SHA1 Message Date
Max Neunhoeffer 03d7ff6571 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-15 11:09:07 +01:00
Max Neunhoeffer 666b996a15 Fix arangom for the future. 2014-01-15 11:08:51 +01:00
Jan Steemann b5a448ffdb added loadPlannedDatabases method 2014-01-15 11:03:01 +01:00
Jan Steemann e02b0b52e1 renamed methods 2014-01-15 10:52:56 +01:00
Jan Steemann e094cc5342 less redundancy of URLs 2014-01-15 10:17:27 +01:00
Jan Steemann 2495b6e720 removed unused variables 2014-01-15 09:52:47 +01:00
Max Neunhoeffer 7aa29fda5b Merge Jan's changes and preliminary version of CreateDB. 2014-01-15 08:52:10 +01:00
Michael Hackstein b0419841f8 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 17:19:06 +01:00
Michael Hackstein ab54081b72 Moved more button-styling to buttons css, except third-party libs all should be there now 2014-01-14 17:18:57 +01:00
Michael Hackstein 5622b1a1f4 Added Headlines to all cluster columns 2014-01-14 17:18:02 +01:00
Jan Steemann ee186c2c6b added locking check 2014-01-14 17:17:25 +01:00
Jan Steemann 3cf65cf228 added AgencyCommLocker.successful() method 2014-01-14 17:16:51 +01:00
Jan Steemann 56ab59dac6 watch for Plan changes 2014-01-14 16:43:44 +01:00
Jan Steemann 7803abe384 removed unused variables 2014-01-14 16:25:35 +01:00
Jan Steemann cbf1c9d899 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 16:23:18 +01:00
Max Neunhoeffer ea3d3c0baa Add ConnectionManager. 2014-01-14 16:23:05 +01:00
Jan Steemann 2aba046c7d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 16:21:57 +01:00
Jan Steemann ce2627619e create collection stub 2014-01-14 16:21:48 +01:00
Max Neunhoeffer f7a9acf592 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-14 15:05:41 +01:00
Max Neunhoeffer fc96df2244 Separate out ConnectionManager from ClusterComm. 2014-01-14 15:04:55 +01:00
Michael Hackstein 8816bfab14 Fixed merge confilct 2014-01-14 15:01:17 +01:00
Michael Hackstein e4976723b6 Added the cluster dashboard to hidden route, will not yet be reachable via navigation 2014-01-14 14:57:25 +01:00
Michael Hackstein 8948b87f12 Added the Cluster Dashboard to the karma tests 2014-01-14 14:55:52 +01:00
Michael Hackstein 6b8333207b Added first implementation of the Cluster Dashboard. Functionality is basic, displayed data is faked and design is comming soon 2014-01-14 14:52:52 +01:00
Jan Steemann 9c63246d1c added TRI_SHARDING_COLLECTION_NOT_IMPLEMENTED macro 2014-01-14 14:04:29 +01:00
Jan Steemann b1c4f75e50 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 13:29:07 +01:00
Jan Steemann 2cc44ba58e upgraded client version number 2014-01-14 13:27:35 +01:00
Jan Steemann 24e17ef58d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 13:19:57 +01:00
Jan Steemann 4ec6f04932 return collection properties 2014-01-14 13:19:43 +01:00
Max Neunhoeffer f50452259e Allow SimpleHttpClient to keep the connection open on destruction. 2014-01-14 12:52:03 +01:00
Max Neunhoeffer f7f8543fea Revert "Add stealConnection to SimpleHttpClient."
This reverts commit 3cf68a58526925d09556eaba2a3f4386563ffb31.
2014-01-14 12:44:21 +01:00
Max Neunhoeffer ebdc06c8b2 Revert "Fix bug in stealConnection."
This reverts commit f6fbcfcff07ebfe21364809d347fdc786689d57e.
2014-01-14 12:44:19 +01:00
Max Neunhoeffer 2e3f2132c3 Revert "One more change to SimpleHttpClient."
This reverts commit b8662d870e924de6d9a1ec0293937976b30701b2.
2014-01-14 12:44:12 +01:00
Max Neunhoeffer 2021240bc6 One more change to SimpleHttpClient. 2014-01-14 12:42:45 +01:00
Max Neunhoeffer 06999a5d25 Fix bug in stealConnection. 2014-01-14 09:44:27 +01:00
Max Neunhoeffer 4a66d69ad5 Add stealConnection to SimpleHttpClient. 2014-01-14 09:42:50 +01:00
Frank Celler 30252c1877 Merge pull request #731 from pluma/error-response-error-names
Added support for error names instead of error types
2014-01-14 00:27:39 -08:00
Jan Steemann f8c50ade6e force reloading of user functions 2014-01-13 17:50:36 +01:00
Jan Steemann ea9765ed24 updated CHANGELOG 2014-01-13 17:30:35 +01:00
Jan Steemann fde16194ff don't throw in propertygetter 2014-01-13 17:30:26 +01:00
Jan Steemann 30b866405e issue #732: Rest API GET revision number 2014-01-13 17:30:17 +01:00
Jan Steemann 50105fc0d9 fixed error in index documentation 2014-01-13 17:30:08 +01:00
Jan Steemann 9d7bd04d99 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/Cluster/AgencyComm.cpp
2014-01-13 16:33:32 +01:00
Jan Steemann ffa919d716 some modifications for collection accessing 2014-01-13 16:32:40 +01:00
Max Neunhoeffer 8c8c0bff69 Create database in cluster done. 2014-01-13 15:07:32 +01:00
Jan Steemann 70ac8a4d1b tried to fix http 400 (agency error 401) 2014-01-13 14:47:32 +01:00
Jan Steemann 01df0fafab Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-13 08:59:36 +01:00
Jan Steemann 0e9a28ccc7 added missing delete 2014-01-13 08:59:20 +01:00
Michael Hackstein 4bb630b030 Further additions to router tests 2014-01-12 22:05:41 +01:00
Michael Hackstein 93065b4a3d Added some more tests to web-interface router. Some routes are tested now. Fixed some minor bugs during tests 2014-01-12 14:44:21 +01:00