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

9919 Commits

Author SHA1 Message Date
Kaveh Vahedipour 89b941d961 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-03 14:56:24 +02:00
Kaveh Vahedipour 5da3d72758 supervision bug 2016-06-03 14:56:18 +02:00
Max Neunhoeffer ee3216b021 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-03 06:33:06 -06:00
Kaveh Vahedipour 00d6111a3e server health for aardvark 2016-06-03 14:27:04 +02:00
Max Neunhoeffer d8573bd009 Revert "Bugfixes in error handling." 
This reverts commit ab7ab515fb, which was
nonsensical.
 2016-06-03 06:26:03 -06:00
Kaveh Vahedipour 2ab638160e server health for aardvark 2016-06-03 13:44:50 +02:00
Kaveh Vahedipour b93981df61 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-03 13:32:24 +02:00
Kaveh Vahedipour 2821d3ab86 jslint error 2016-06-03 13:32:15 +02:00
Frank Celler 8da37f59eb switch to RandomGenerator 2016-06-03 13:30:28 +02:00
Frank Celler 00c7b96ade silenced warning 2016-06-03 13:30:28 +02:00
Jan Steemann 5925b3a077 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-03 12:56:42 +02:00
Jan Steemann 6412200f27 added /_api/aql-builtin 2016-06-03 12:56:18 +02:00
Jan Steemann 8b1366205a added 28 compatibility flag for dumping 2016-06-03 12:47:51 +02:00
Kaveh Vahedipour 427453bcc7 server health for aardvark 2016-06-03 12:19:39 +02:00
Jan Steemann 38dbbfdf9d changed division by zero result 2016-06-03 11:50:45 +02:00
Andreas Streichardt cbc9b3a749 fix hasRunOnce 2016-06-03 10:55:43 +02:00
Frank Celler ee98b59e2f changed reload to outdated 2016-06-03 10:38:47 +02:00
Jan Steemann 5c0dd05308 added PI() function 2016-06-03 09:25:46 +02:00
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