1
0
Fork 0
Commit Graph

9901 Commits

Author SHA1 Message Date
Andreas Streichardt 465252e415 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-02 19:51:47 +02:00
Andreas Streichardt 0129e968df Fix authentication_parameters 2016-06-02 19:51:38 +02:00
Wilfried Goesgens 8502bfa4d3 Refactor windows service infrastructure 2016-06-02 18:30:23 +02:00
jsteemann a9451e09d9 removed now-invalid asserts 2016-06-02 17:35:36 +02:00
Kaveh Vahedipour 8c882c6b3b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-02 17:22:17 +02:00
Kaveh Vahedipour 6f62f5baa3 checking before range loops for emptyness 2016-06-02 17:22:12 +02:00
Andreas Streichardt 1534f2f123 add grants 2016-06-02 16:39:57 +02:00
Andreas Streichardt a3d5ce8d16 Merge remote-tracking branch 'origin' into jwt 2016-06-02 14:45:21 +02:00
Andreas Streichardt 1084d4c14a Fix jwt authentication 2016-06-02 14:44:19 +02:00
jsteemann b247a6e08c added --hund option 2016-06-02 13:54:53 +02:00
Kaveh Vahedipour f56d36d168 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-02 12:17:40 +02:00
Kaveh Vahedipour 2e87f59218 Testing supervision 2016-06-02 12:17:35 +02:00
jsteemann b7ebadc055 make some RocksDB options available to ArangoDB 2016-06-02 12:00:36 +02:00
Frank Celler 8c9055f3fd Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-06-02 11:13:23 +02:00
Frank Celler c57ba92de3 fixed access 2016-06-02 11:12:35 +02:00
jsteemann 222c57ed32 renamed "rocksdb" index to "persistent" index 2016-06-02 10:23:30 +02:00
Kaveh Vahedipour e53bd53def Removed exception handling around run in supervision in expectation that all errors have been handled 2016-06-02 10:14:27 +02:00
Frank Celler 397623460e WIP 2016-06-02 09:49:36 +02:00
Frank Celler b476122344 added use database 2016-06-02 09:28:37 +02:00
Frank Celler 22b454800d WIP 2016-06-01 23:03:00 +02:00
Frank Celler 70db2ede15 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-06-01 17:59:29 +02:00
Andreas Streichardt 74719c76a6 Merge branch 'devel' into jwt 2016-06-01 17:59:10 +02:00
Andreas Streichardt 021b71a7c1 Frontend is working 2016-06-01 17:51:39 +02:00
Frank Celler 783eddd91a added grant database and revoke database 2016-06-01 17:46:13 +02:00
Jan Steemann dcd449119c added C++ implementation of CONCAT_SEPARATOR 2016-06-01 17:10:16 +02:00
Jan Steemann c3da3692bc removed unused implementation of nextBabies() 2016-06-01 17:09:58 +02:00
Jan Steemann 192caed889 fix Visual Studio compile warnings 2016-06-01 17:09:43 +02:00
Frank Celler 6f09122da2 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-06-01 16:25:21 +02:00
Frank Celler 1e25e5d262 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Cluster/HeartbeatThread.cpp
	arangod/RestServer/RestServerFeature.cpp
2016-06-01 16:25:13 +02:00
Jan Steemann a624ea4ec5 attempt to fix PrimaryIndexIterator::nextBabies() 2016-06-01 16:23:32 +02:00
Frank Celler 3e61cb433d WIP 2016-06-01 15:57:28 +02:00
Kaveh Vahedipour 0b6a6788cc supervision was accessing read db after it had started shutting down. 2016-06-01 15:16:21 +02:00
Kaveh Vahedipour ac2fc7b8a0 hunting down invalid mutex in shutdown of agency 2016-06-01 12:51:56 +00:00
Kaveh Vahedipour 65d9370615 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-01 13:44:38 +02:00
Kaveh Vahedipour cc23d0df99 Cleaning out server 2016-06-01 13:44:27 +02:00
Frank Celler 963449d5f7 WIP 2016-06-01 13:37:13 +02:00
Jan Steemann e2ec68c001 added tests for AQL functions 2016-06-01 13:32:08 +02:00
Andreas Streichardt ba14069f93 Merge branch 'devel' into jwt 2016-06-01 12:10:12 +02:00
Andreas Streichardt 630d12713d Merge branch 'devel' into jwt 2016-06-01 10:19:53 +02:00
Simran Brucherseifer f718a8995a Add ATAN2() function to AQL 2016-06-01 02:57:31 +02:00
Max Neunhoeffer 7e44916426 Protect the whole Supervision thread by a try/catch block. 2016-05-31 18:20:05 -06:00
Kaveh Vahedipour f4591e3a6f hunting down exceptions in agency supervision 2016-05-31 22:28:02 +02:00
Kaveh Vahedipour 2799275634 hunting down exceptions in agency supervision 2016-05-31 21:49:07 +02:00
Kaveh Vahedipour 9957270df6 hunting down exceptions in agency supervision 2016-05-31 21:42:41 +02:00
Kaveh Vahedipour 402ed3c2a3 hunting down the exeption in agency 2016-05-31 21:35:07 +02:00
Max Neunhoeffer b42fc76e51 Agency starts before bootstrap again. 2016-05-31 12:46:24 -06:00
Max Neunhoeffer 0cb9441912 First Bootstrap, then AgencyFeature. 2016-05-31 12:44:19 -06:00
Max Neunhoeffer fbd03bd52b Only start ConsoleFeature after BootstrapFeature. 2016-05-31 12:39:13 -06:00
Max Neunhoeffer 61a812662a Only start UnitTestFeature after BootstrapFeature. 2016-05-31 12:38:52 -06:00
Max Neunhoeffer b600ddbeb4 Fix getUniqueIds and updateAgencyPrefix in Supervision.
This prevents some race conditions at cluster startup that crashed the
agency.
2016-05-31 12:38:17 -06:00