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

27070 Commits

Author SHA1 Message Date
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
Kaveh Vahedipour c97524a5c6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-04 08:42:15 +02:00
Kaveh Vahedipour bcc180bf2b Clearing time table effectlively done the same way as for external calls 2016-04-04 08:41:59 +02:00
Andreas Streichardt 983c6f1b7e Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-01 17:21:42 +02:00
Andreas Streichardt 70d6f1259a Finally cluster is working with the new agency 2016-04-01 17:07:28 +02:00
hkernbach f0bb30c3f7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-01 15:41:28 +02:00
hkernbach d464d69406 query view now reacts to a killed query 2016-04-01 15:41:20 +02:00
Kaveh Vahedipour 3e2f7b4043 replaced put_time 2016-04-01 15:34:13 +02:00
Kaveh Vahedipour a3d8ce9cab gcc 4.8 does not entail std::put_time 2016-04-01 15:22:08 +02:00
Kaveh Vahedipour 1dba990295 ttl overwrite 2016-04-01 15:10:20 +02:00
Kaveh Vahedipour f013604f47 ttl overwright 2016-04-01 15:01:53 +02:00
Kaveh Vahedipour 3127b4227b ttl overwright 2016-04-01 14:45:42 +02:00
Kaveh Vahedipour 0849737d78 Overwriting ttls 2016-04-01 14:28:25 +02:00
Kaveh Vahedipour 8ace3c10a3 Overwriting ttls 2016-04-01 14:24:30 +02:00
Kaveh Vahedipour 1322c117e4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-01 12:42:50 +02:00
Frank Celler e536234aae bound check 2016-04-01 12:26:46 +02:00
Kaveh Vahedipour 65623fc4e7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-01 10:42:07 +02:00