1
0
Fork 0
Commit Graph

29733 Commits

Author SHA1 Message Date
Max Neunhoeffer e3abdeb73c Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-09 11:16:30 +02:00
Max Neunhoeffer d48342d3b5 Change sleep to wait. 2016-05-09 11:16:16 +02:00
Kaveh Vahedipour 286e04df48 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-09 11:10:42 +02:00
Kaveh Vahedipour d3f7cab286 Merge branch 'json_agency_comm' of https://github.com/arangodb/arangodb into devel 2016-05-09 11:09:52 +02:00
Wilfried Goesgens 030233a642 Fix OS detection for rocksdb. this fixes #1814 2016-05-09 11:06:25 +02:00
Kaveh Vahedipour 0aaec5b783 moving agency compaction to c++ interface 2016-05-09 11:04:56 +02:00
Michael Hackstein 21b27485ee Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 11:03:37 +02:00
Michael Hackstein 914bb6c93e Fixed JSLint 2016-05-09 11:03:30 +02:00
Max Neunhoeffer 2815bebf13 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-09 10:04:19 +02:00
Michael Hackstein a24fc0757d Added some more tests for wired AQL append input parameters. 2016-05-09 09:57:56 +02:00
Max Neunhoeffer 55cf4bf58b Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-09 09:49:12 +02:00
Max Neunhoeffer b00d3c5624 Finish overhaul of ClusterInfo.cpp w.r.t. callbacks. 2016-05-09 09:47:27 +02:00
Michael Hackstein 6f4a65d7a6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 09:39:33 +02:00
Michael Hackstein 8dd27b01f8 Added an Index and an AQL statement to the quickie test. 2016-05-09 09:39:23 +02:00
Kaveh Vahedipour c8dca04054 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-09 08:58:39 +02:00
Kaveh Vahedipour 7ff3cc5f1e agency compaction to c++ database api 2016-05-09 08:58:31 +02:00
Max Neunhoeffer 675fdff145 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-09 08:39:19 +02:00
Kaveh Vahedipour 220c286a11 agency compaction to c++ database api 2016-05-09 08:12:22 +02:00
jsteemann 4691a0868d removed unnecessary iostream includes 2016-05-07 08:06:26 +02:00
jsteemann cc9f17f42b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-07 07:56:22 +02:00
jsteemann e1f874ad4a jslint 2016-05-07 07:56:16 +02:00
jsteemann 57bc554d9a cppcheck 2016-05-07 07:55:57 +02:00
Max Neunhoeffer f971c3cf82 Overhaul AgencyCallback. 2016-05-07 01:11:15 +02:00
Max Neunhoeffer 7ed306c2e7 Fix double locking of mutex of condition variable. 2016-05-06 23:25:19 +02:00
Max Neunhoeffer b37d8fff48 Better protection against multi-threading. 2016-05-06 23:06:10 +02:00
Max Neunhoeffer b5c87fba33 Add a trivial quickie test and a convenience script. 2016-05-06 22:47:17 +02:00
Max Neunhoeffer 1d8c7e4515 Take out a debug message. 2016-05-06 22:46:40 +02:00
Max Neunhoeffer 66f1fce328 Repair startLocalCluster.sh script w.r.t. XTERM and XTERMOPTIONS. 2016-05-06 22:46:23 +02:00
Max Neunhoeffer ce9ca50b95 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-06 22:33:55 +02:00
Max Neunhoeffer 0fbc48b83e Improve cluster in various ways.
Finish implementation of AgencyReadTransaction.
Use AgencyReadTransaction in HeartbeatThread of coordinator (less requests).
Repair ClusterInfo::uniqid.
Repair AgencyComm::uniqid.
Remove x-etcd-index header.
Remove _index in AgencyCommResult.
Streamline HeartbeatThread of coordinator.
Remove lastCommandIndex from AgencyComm.
Fix HeartbeatThread::handleStateChange.
2016-05-06 22:30:27 +02:00
Jan Steemann 5492a79adb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-06 19:15:06 +02:00
Jan Steemann c14e9d20c8 removed obsolete tests 2016-05-06 19:14:55 +02:00
Andreas Streichardt 9cbf7aae33 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-06 19:12:30 +02:00
Jan Steemann 28b6172580 updated documentation 2016-05-06 19:00:16 +02:00
Andreas Streichardt 016b79f4c7 Fix object requirement 2016-05-06 18:58:58 +02:00
Jan Steemann 0bd61cf928 removed option `--server.default-api-compatibility` 2016-05-06 18:38:37 +02:00
Andreas Streichardt dc95f2b4c1 Merge branch 'json_agency_comm' into devel 2016-05-06 18:38:24 +02:00
Andreas Streichardt 1233186eba actually use swapDatabases variable 2016-05-06 18:32:55 +02:00
Andreas Streichardt 0a14a56cb9 mop trying to do c++ => fail 2016-05-06 18:29:33 +02:00
Andreas Streichardt a121aff1a0 Implement proper (database) current loading 2016-05-06 18:10:45 +02:00
Jan Steemann b2171e425d removed unused functions 2016-05-06 17:59:06 +02:00
Andreas Streichardt 9cbe13dd43 Merge branch 'json_agency_comm' into devel 2016-05-06 17:21:41 +02:00
Jan Steemann 1b9f10bfa8 updated API changes documentation 2016-05-06 17:14:11 +02:00
Andreas Streichardt 3773b0e66c Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-06 17:04:04 +02:00
Andreas Streichardt 04ba5156e5 Rework planned collection loading 2016-05-06 17:03:13 +02:00
Jan Steemann 8597c84ac2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-06 14:00:15 +02:00
Jan Steemann 316f2bd1fb updated changes 2016-05-06 14:00:00 +02:00
Jan Steemann fb723c3c24 fixed crash 2016-05-06 13:59:24 +02:00
Jan Steemann 94c2f4c9b4 fixed crash 2016-05-06 13:44:33 +02:00
Jan Steemann 49c39f6659 removed unused functions 2016-05-06 12:30:04 +02:00