1
0
Fork 0
Commit Graph

30940 Commits

Author SHA1 Message Date
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
Mark b469ceaf35 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-02 08:47:05 +02:00
Frank Celler 22b454800d WIP 2016-06-01 23:03:00 +02:00
Simran Brucherseifer 400c384ac8 Sort numeric functions alphabetically 2016-06-01 20:42:40 +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
Frank Celler d7df0ee667 updated doc 2016-06-01 17:57:20 +02:00
Andreas Streichardt b00322b2e1 Classic 2016-06-01 17:54:14 +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 2003d507a8 added tests 2016-06-01 17:29:17 +02:00
Mark 69f622d5af Compiler-Option /MP (multiple processes) added 2016-06-01 17:22:42 +02:00
Frank Celler 0954dbf2d5 Merge branch 'FMH' of https://github.com/arangodb/arangodb into FMH 2016-06-01 17:15:00 +02:00
Frank Celler 80df233daa WIP 2016-06-01 17:14:29 +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
Jan Steemann e82ed380e6 added tests 2016-06-01 16:23:12 +02:00
Frank Celler 3e61cb433d WIP 2016-06-01 15:57:28 +02:00
Kaveh Vahedipour 1853e118fa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-01 15:16:30 +02:00
Kaveh Vahedipour 0b6a6788cc supervision was accessing read db after it had started shutting down. 2016-06-01 15:16:21 +02:00
Wilfried Goesgens b6a1837fd5 not not not. 2016-06-01 15:08:02 +02:00
jsteemann 21d0be76e6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-01 15:06:44 +02:00
jsteemann 7bb5675031 set log level to debug 2016-06-01 15:06:34 +02:00
Wilfried Goesgens eae752786f Windows: also need to check for FN.exe 2016-06-01 15:05:24 +02:00
Kaveh Vahedipour ac2fc7b8a0 hunting down invalid mutex in shutdown of agency 2016-06-01 12:51:56 +00:00
Jan Steemann b73a811c65 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-01 14:32:48 +02:00
Jan Steemann 6c274b8a66 added AQL functions docs 2016-06-01 14:32:38 +02:00
Jan Steemann 5cf2d052d8 added documentation for AQL functions 2016-06-01 14:26:03 +02:00
Wilfried Goesgens 13255937ca Check for files to actually exist before we execute them. 2016-06-01 13:55:07 +02: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
Wilfried Goesgens ac68aa7c9b Add the build target to the windows install target. 2016-06-01 12:29:25 +02:00
Andreas Streichardt ba14069f93 Merge branch 'devel' into jwt 2016-06-01 12:10:12 +02:00
Andreas Streichardt 0c61eab0da Reconnecting now uses the correct user 2016-06-01 12:09:49 +02:00
Andreas Streichardt 1fb57a2a93 properly check for failures 2016-06-01 12:08:44 +02:00
Andreas Streichardt 52c8f272da Reconnecting now uses the correct user 2016-06-01 12:07:45 +02:00
Andreas Streichardt 630d12713d Merge branch 'devel' into jwt 2016-06-01 10:19:53 +02:00
Andreas Streichardt 979e0f2d07 proper expiry 2016-06-01 09:59:24 +02:00
Andreas Streichardt 2a1c9b93f4 Fix eslint stuff 2016-06-01 09:50:32 +02:00
Frank Celler 54300ed30c moved Console/ClientFeature to arangosh 2016-06-01 09:27:29 +02:00
Jan e2d12ba491 Merge pull request #1849 from Simran-B/devel
Add ATAN2() and adjust/extend tests for CONCAT() and CONCAT_SEPARATOR()
2016-06-01 09:26:22 +02:00
Simran Brucherseifer a3af3ed44a Adjust and extend tests for CONCAT*() 2016-06-01 02:57:31 +02:00