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

27086 Commits

Author SHA1 Message Date
hkernbach 8d7d68158e added mode check 2016-04-07 14:22:17 +02:00
hkernbach 81faa5b08b grunt 2016-04-07 12:57:53 +02:00
hkernbach f2691ba818 issue #1793 2016-04-07 12:54:16 +02:00
hkernbach 00fb467592 Merge remote-tracking branch 'origin/devel' into frontendmerge 2016-04-06 19:06:46 +02:00
hkernbach 090f5416a3 grunt 2016-04-06 17:45:33 +02:00
hkernbach 4578b66441 merging web interfaces 2016-04-06 17:44:22 +02:00
Wilfried Goesgens 1e772d1427 Adjust to the new reality without make 2016-04-06 17:40:28 +02:00
Andreas Streichardt bdda4952ef Fix replication still requiring planner 2016-04-06 17:34:43 +02:00
Wilfried Goesgens fadda6536b Add example systemd servince file. 2016-04-06 11:01:35 +02:00
Andreas Streichardt 3bdbded541 Fix linter errors 2016-04-05 18:45:39 +02:00
Andreas Streichardt c2cf4be4e0 Remove etcd 2016-04-05 18:41:37 +02:00
Andreas Streichardt 9b64158020 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-05 17:46:00 +02:00
Andreas Streichardt d2d7af67fe Kickstarter and planner are dead 2016-04-05 17:45:39 +02:00
Wilfried Goesgens 4a7e54e215 Implement ECDH initialisation for openSSL 2016-04-05 14:18:26 +02:00
Andreas Streichardt bad100312f fix testing 2016-04-05 14:16:48 +02:00
Andreas Streichardt 4c540e8330 Backport from spdvpk 2016-04-05 14:15:15 +02:00
Andreas Streichardt 0dd6e65310 Fix warning 2016-04-05 13:40:24 +02:00
Andreas Streichardt 529199a9c3 streamline error log handling 2016-04-05 13:35:48 +02:00
Andreas Streichardt d46fba735b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-05 12:19:10 +02:00
Andreas Streichardt 0ac34f174a Fix agency test invocation 2016-04-05 12:18:53 +02:00
Jan Steemann 368f7e7f69 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-05 11:29:58 +02:00
Jan Steemann 19c06e01dd fixed wrong text 2016-04-05 11:29:41 +02:00
Andreas Streichardt 8859ee1de4 Fix line ending madness 
treat csv files as binary so we can CONSISTENTLY import csv files
containing \r\n on any system
 2016-04-05 11:21:24 +02:00
Andreas Streichardt 6554cd9cee Fix dumpand restore stuff 2016-04-05 10:31:33 +02:00
Andreas Streichardt bda650e112 remove oboslete variables 2016-04-05 08:46:21 +02:00
Andreas Streichardt 47facc7f50 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-04 19:27:53 +02:00
Andreas Streichardt 49a3d3e018 Cleaning up the ifs....Greatly simplifying testing.js 2016-04-04 19:26:30 +02:00
Andreas Streichardt a0e6778ab2 fix jslint 2016-04-04 18:16:45 +02:00
Andreas Streichardt 91df9e36b2 Merge branch 'agency' into devel 2016-04-04 15:50:25 +02:00
Kaveh Vahedipour 005e8dfd00 type fixed 2016-04-04 15:48:11 +02:00
Andreas Streichardt a2b8bb92f2 Oops...still conflicted 2016-04-04 15:45:30 +02:00
Andreas Streichardt 675ccf06f9 Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-04 15:22:42 +02:00
Andreas Streichardt 1150d2b06a Talk to coordinator 2016-04-04 15:11:10 +02:00
Kaveh Vahedipour 9bfa55120a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-04 14:58:34 +02:00
Kaveh Vahedipour 47bac5b4d9 temporary fix of jslint errors 2016-04-04 14:58:25 +02:00
Kaveh Vahedipour 3d3f11ef54 comments 2016-04-04 12:55:18 +00:00
Kaveh Vahedipour 0939652e6c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-04 14:45:12 +02:00
Kaveh Vahedipour 8023aaccf3 code beautification 2016-04-04 14:45:09 +02:00
Kaveh Vahedipour 5caf02768c code beautification 2016-04-04 14:42:49 +02:00
Kaveh Vahedipour 062a759bca Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-04-04 12:13:48 +00:00
Kaveh Vahedipour 723eb01cee merging back from agency 2016-04-04 12:13:43 +00:00
Andreas Streichardt e5850658fb Merge branch 'devel' of github.com:arangodb/arangodb into agency 2016-04-04 13:36:22 +02:00
Andreas Streichardt 3b81a1cd3d Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-04 13:35:59 +02:00
Andreas Streichardt d56500b4c0 Implement cluster tests 2016-04-04 13:35:30 +02:00
Frank Celler 0c5a6bcaf6 fixed boost tests 2016-04-04 13:25:57 +02:00
Kaveh Vahedipour 1293c9301a agency's own endpoint is now derived from server.endpoint 2016-04-04 11:23:46 +00:00
Kaveh Vahedipour c61f73314c endpoints are now coming from applicationendpointserver 2016-04-04 12:49:35 +02:00
Kaveh Vahedipour b26ea07eaf endpoints are now coming from applicationendpointserver 2016-04-04 11:50:24 +02:00
Kaveh Vahedipour 67e6e403e3 agency's own endpoint is now derived from server.endpoint 2016-04-04 11:28:48 +02:00
Jan Steemann d8b993f0fb fixed some issues with tests 2016-04-04 10:47:04 +02:00