1
0
Fork 0
Commit Graph

9671 Commits

Author SHA1 Message Date
Jan Steemann 8e090e642e removed "createCollection" attribute from APIs 2016-05-12 15:17:45 +02:00
Jan Steemann 3e781e82dd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-12 14:41:50 +02:00
Jan Steemann a32a74b7bb fixed assertion failure 2016-05-12 14:41:33 +02:00
jsteemann abb0f36d55 fixed hashes 2016-05-12 11:11:20 +02:00
jsteemann 988413021f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-12 10:24:21 +02:00
Kaveh Vahedipour d9a6a1efd6 cluster supervision moves broken leaders 2016-05-12 10:08:46 +02:00
Kaveh Vahedipour de9618572c Faulty implementation of checks for multiple preconditions in agency 2016-05-12 10:02:13 +02:00
jsteemann ace3d4b900 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-12 09:07:47 +02:00
Kaveh Vahedipour 4efb6aac7f oops pushed conflict 2016-05-12 08:51:10 +02:00
Kaveh Vahedipour ed94cbbdcc cluster supervision moves broken leaders 2016-05-12 08:36:41 +02:00
jsteemann 575101b2b3 fixed program options display 2016-05-12 00:46:04 +02:00
jsteemann 11f2afad44 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-12 00:00:37 +02:00
jsteemann d4cb93fb9c added TYPENAME() and HASH() functions 2016-05-11 23:54:00 +02:00
jsteemann 61b24c5b47 optimizations 2016-05-11 22:16:15 +02:00
jsteemann 141cf7a498 increase gc delay 2016-05-11 21:02:51 +02:00
jsteemann 130493d481 micro optimizations 2016-05-11 21:02:20 +02:00
Jan Steemann 7e16f1ffd9 pacify MSVC 2016-05-11 19:02:18 +02:00
Frank Celler 0117a38260 fixed ssl init 2016-05-11 18:07:45 +02:00
Max Neunhoeffer ead3f17a5c Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-11 16:40:29 +02:00
Max Neunhoeffer c2ce2c5347 Remove tabs in source. 2016-05-11 16:38:36 +02:00
Frank Celler bf16086623 moved SSL files into separate directory 2016-05-11 16:34:03 +02:00
Andreas Streichardt 738b6db4c0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-11 16:30:52 +02:00
Andreas Streichardt 64a567a5a0 ROCKSDB uses static snappy from 3rdparty 2016-05-11 16:30:24 +02:00
Max Neunhoeffer 20cd5f2c2a Delete more unused stuff from AgencyComm. 2016-05-11 16:15:01 +02:00
Andreas Streichardt 5d3abc879e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-11 15:31:11 +02:00
Andreas Streichardt 4d13e8fb1b _listDatabases() => _databases() 2016-05-11 15:30:47 +02:00
jsteemann d6e9b7b38b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-11 15:01:10 +02:00
jsteemann 3f1516eca7 bugfixes 2016-05-11 15:01:06 +02:00
Kaveh Vahedipour b4a5d49969 git push
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-05-11 14:59:53 +02:00
Kaveh Vahedipour 5f8f8a628a cluster supervision moves broken leaders 2016-05-11 14:59:10 +02:00
Max Neunhoeffer 73bdf4b8b5 More silence at startup. 2016-05-11 14:48:31 +02:00
Max Neunhoeffer 071c51abe4 A paranoid change to avoid a use after free. Fixed a typo. 2016-05-11 14:48:12 +02:00
jsteemann 98f0ad81a6 micro optimizations 2016-05-11 14:06:47 +02:00
jsteemann e2c7736ba8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-11 11:50:36 +02:00
jsteemann bfd5596359 optimizations 2016-05-11 11:50:07 +02:00
Max Neunhoeffer f41ab22098 Change a few startup messages from level INFO to DEBUG. 2016-05-11 11:42:33 +02:00
Jan Steemann 912383ca68 cppcheck 2016-05-10 20:13:55 +02:00
Kaveh Vahedipour 6694179e57 cluster supervision moves broken leaders 2016-05-10 19:39:23 +02:00
jsteemann 213ade22a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-10 19:01:30 +02:00
jsteemann 0ce8599598 fixes for MSVC 2016-05-10 19:01:21 +02:00
Andreas Streichardt e88daf35c0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-10 18:42:51 +02:00
Andreas Streichardt 2c7b7450e1 handlePlanChange() will now use the cache 2016-05-10 18:42:30 +02:00
jsteemann 9561720ed6 global try...catch for all client tools 2016-05-10 17:02:06 +02:00
jsteemann 30525fccee use StaticStrings 2016-05-10 17:01:34 +02:00
jsteemann 55a20df204 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-10 16:04:16 +02:00
jsteemann 61be9321a7 removed unused code 2016-05-10 16:04:10 +02:00
Max Neunhoeffer 39ecd9fd13 Rename prefix and prefixStripped in AgencyComm. 2016-05-10 16:00:07 +02:00
Max Neunhoeffer 825f010980 Rename getValues2 to getValues. 2016-05-10 15:52:54 +02:00
Max Neunhoeffer 19121b81a4 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-10 15:47:53 +02:00
Max Neunhoeffer d44546296d Remove AgencyComm::getValues() for good and purge TRI_json_t in ClusterInfo. 2016-05-10 15:43:58 +02:00