1
0
Fork 0
Commit Graph

11400 Commits

Author SHA1 Message Date
Andreas Streichardt 9d03f85e9b Fix dump authentication test 2016-06-03 11:19:42 +02:00
Jan Steemann 5c0dd05308 added PI() function 2016-06-03 09:25:46 +02:00
Andreas Streichardt 54de1a5e52 fix jslint 2016-06-02 19:55:05 +02:00
Andreas Streichardt a1f9b94bce Remove session stuff 2016-06-02 17:56:26 +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 cdb04e42e4 Merge remote-tracking branch 'origin/FMH' into jwt 2016-06-02 16:29:38 +02:00
Andreas Streichardt a3d5ce8d16 Merge remote-tracking branch 'origin' into jwt 2016-06-02 14:45:21 +02:00
Frank Celler 572e2524fa added config 2016-06-02 12:52:35 +02:00
Jan Steemann 268c349dee added new AQL functions for syntax highlighting 2016-06-02 12:04:30 +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
Jan Steemann b2c000ab8b added tests 2016-06-02 10:24:40 +02:00
jsteemann 222c57ed32 renamed "rocksdb" index to "persistent" index 2016-06-02 10:23:30 +02:00
Frank Celler 397623460e WIP 2016-06-02 09:49:36 +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 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
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
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 e82ed380e6 added tests 2016-06-01 16:23:12 +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
Wilfried Goesgens 13255937ca Check for files to actually exist before we execute them. 2016-06-01 13:55:07 +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 1fb57a2a93 properly check for failures 2016-06-01 12:08:44 +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
Simran Brucherseifer a3af3ed44a Adjust and extend tests for CONCAT*() 2016-06-01 02:57:31 +02:00
Simran Brucherseifer f718a8995a Add ATAN2() function to AQL 2016-06-01 02:57:31 +02:00
Max Neunhoeffer 778bb0685b New swagger output. 2016-05-31 18:11:32 -06:00
Max Neunhoeffer 2e0d832d89 More resilience tests. 2016-05-31 13:49:26 -06:00
Max Neunhoeffer 64be77551f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-31 12:41:48 -06:00
Max Neunhoeffer 436e1a52ed Handle extraArgs correctly, start supervision in agency in tests. 2016-05-31 12:39:45 -06:00
Andreas Streichardt a6a6f162fa Fix hardcoded jwt 2016-05-31 19:26:38 +02:00
Andreas Streichardt 9178e560eb Implement jwt tests 2016-05-31 19:19:10 +02:00
Wilfried Goesgens ec270af71d Fresh swagger 2016-05-31 19:13:01 +02:00
Max Neunhoeffer 52e2f8cb01 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-31 10:38:06 -06:00
Max Neunhoeffer 0deed878ba Start statistics tasks only with a delay. 2016-05-31 10:36:01 -06:00