1
0
Fork 0
Commit Graph

43 Commits

Author SHA1 Message Date
Frank Celler ee98b59e2f changed reload to outdated 2016-06-03 10:38:47 +02:00
jsteemann a9451e09d9 removed now-invalid asserts 2016-06-02 17:35:36 +02:00
Frank Celler 22b454800d WIP 2016-06-01 23:03:00 +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
Frank Celler 3e61cb433d WIP 2016-06-01 15:57:28 +02:00
Frank Celler 963449d5f7 WIP 2016-06-01 13:37:13 +02:00
Andreas Streichardt 87f09b986a Compiles 2016-05-31 14:28:15 +02:00
Andreas Streichardt 6cb00f905d Merge branch 'devel' into jwt 2016-05-30 18:49:26 +02:00
Andreas Streichardt 5b0055bfbf jwt generation works 2016-05-30 18:47:04 +02:00
Andreas Streichardt 84a7213755 Add jwtsecret 2016-05-30 14:48:35 +02:00
Andreas Streichardt 1cb973ea1f Current work 2016-05-27 11:02:42 +02:00
jsteemann fd1e7f0944 friendlier error message when using a renamed option 2016-05-25 21:45:53 +02:00
jsteemann 2ed62d324a test fix 2016-05-19 15:24:45 +02:00
jsteemann 51d4e470be fixed async requests 2016-05-19 14:53:41 +02:00
Andreas Streichardt d84e60108c move proxy thing into different section as it is only relevant for the frontend right now 2016-05-19 10:39:59 +02:00
Andreas Streichardt d695743df2 Add proxy check 2016-05-17 20:23:47 +02:00
Frank Celler 0117a38260 fixed ssl init 2016-05-11 18:07:45 +02:00
Frank Celler bf16086623 moved SSL files into separate directory 2016-05-11 16:34:03 +02:00
jsteemann 3f1516eca7 bugfixes 2016-05-11 15:01:06 +02:00
Jan Steemann 0bd61cf928 removed option `--server.default-api-compatibility` 2016-05-06 18:38:37 +02:00
Max Neunhoeffer b9e935b928 At bootstrap: Only leave maintenance mode if things are initialized. 2016-05-02 13:52:46 +02:00
jsteemann abd13fea06 fix initialization 2016-05-01 00:08:12 +02:00
jsteemann 1250fcf63e micro optimizations 2016-05-01 00:03:23 +02:00
Max Neunhoeffer b05464b78c Cluster bootstrap revolution. 2016-04-29 13:59:12 +02:00
Frank Celler 0f541f6ec3 fixed namespace 2016-04-28 19:17:38 +02:00
jsteemann cd45a52ba5 attempt to finish startup order 2016-04-27 22:54:29 +02:00
jsteemann bfd6fa833d disallow thread creation until ApplicationServer::start() 2016-04-27 16:17:46 +02:00
Frank Celler 33c96bea86 added application/x-velocypack 2016-04-26 23:01:36 +02:00
Jan Steemann 866f858acc try to fix some startup confusion 2016-04-26 17:45:18 +02:00
jsteemann dcc5825f93 cleaned up features a bit 2016-04-24 14:29:29 +02:00
Frank Celler c46eb8e65e added LogfileManager as feature 2016-04-23 16:34:57 -07:00
Jan Steemann 104e8e8b9b remove ArangoServer.h remainders 2016-04-22 20:18:28 +02:00
Jan Steemann 143c2378af fixed leak 2016-04-22 13:01:32 +02:00
Frank Celler ac3a9883b9 restored log buffer feature 2016-04-21 21:07:23 -07:00
jsteemann 4a87925b41 fixed cluster start 2016-04-20 17:36:39 +02:00
Max Neunhoeffer eacd5f504a Add dependency of features. 2016-04-20 14:16:48 +02:00
Max Neunhoeffer 7a12918021 Fix agency startup. Agency not yet working. 2016-04-20 12:25:13 +02:00
jsteemann ef027dabaf added missing handler 2016-04-20 10:34:05 +02:00
Frank Celler 2dd798cd48 WIP 2016-04-15 22:09:55 -07:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler b2b5fbb62d WIP 2016-04-14 14:02:07 -07:00
Frank Celler 0fa6435731 WIP 2016-04-13 21:12:16 +02:00
Frank Celler 3f9dd62d4c WIP 2016-04-13 12:30:18 +02:00