1
0
Fork 0
Commit Graph

26947 Commits

Author SHA1 Message Date
Kaveh Vahedipour 0257162f82 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-29 14:13:12 +02:00
Kaveh Vahedipour 26e871c051 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-29 14:11:15 +02:00
Kaveh Vahedipour 1e6d47700a visualstudio compatibility of std::chrono::duration<double,std::ratio<1,1>> missing. 2016-03-29 14:11:01 +02:00
hkernbach dadcee6eaa removed console logs 2016-03-29 13:46:30 +02:00
hkernbach 622975182a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-29 13:37:43 +02:00
hkernbach 51678757cb frontend bugfix wrong collection type 2016-03-29 13:37:31 +02:00
Kaveh Vahedipour 7959f01d4a Merge branch 'agency' of https://github.com/arangodb/arangodb into agency 2016-03-29 11:10:24 +00:00
Kaveh Vahedipour c56bb57468 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-29 13:07:18 +02:00
Kaveh Vahedipour 173a6010b5 VisualStudio warnings 2016-03-29 13:01:23 +02:00
hkernbach 06e40476f7 frontend memory issue #1717 2016-03-29 11:01:32 +02:00
Kaveh Vahedipour a11ed509a1 some consistency namign 2016-03-29 10:28:57 +02:00
Kaveh Vahedipour 8e24b383de VisualStudio compatibility 2016-03-29 07:25:28 +00:00
Jan Steemann ecf2deadb8 jslint 2016-03-24 19:35:37 +01:00
Andreas Streichardt c95dc5df3d remove obsolete cmakelists 2016-03-24 19:03:58 +01:00
Andreas Streichardt a3976643a5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-24 19:02:05 +01:00
Andreas Streichardt 11e7808641 Hopefully fix unittest boost fun 2016-03-24 19:01:34 +01:00
Jan Steemann 0b9b84ee11 fixed wrong documentation for SHORTEST_PATH 2016-03-24 18:19:03 +01:00
Kaveh Vahedipour 1f9e40fbf6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-24 17:54:13 +01:00
Kaveh Vahedipour afad06d1d0 updating tests 2016-03-24 17:54:02 +01:00
Andreas Streichardt 8a93687d93 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-24 16:56:35 +01:00
Andreas Streichardt 9ba72b4412 Properly update current collection 2016-03-24 16:55:15 +01:00
Kaveh Vahedipour aaf7e829fb nasty bug in state. erradic behaviour on removing conflicting entries in state machine. 2016-03-24 16:43:11 +01:00
Kaveh Vahedipour 5f8bd3d720 address sanitizer bitching about non-initialised boolean 2016-03-24 15:37:26 +01:00
Kaveh Vahedipour 88909eb50a Agency write sensitive to X-ArangoDB-Agency-Mode 2016-03-24 14:28:21 +01:00
Andreas Streichardt 3f9f03bb38 Remove debug 2016-03-24 14:26:12 +01:00
Kaveh Vahedipour 9d43d4b708 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-24 14:14:45 +01:00
Kaveh Vahedipour 1bdfe53ec2 Agency write sensitive to X-ArangoDB-Agency-Mode 2016-03-24 14:14:33 +01:00
Jan Steemann 7b758efaeb handle status CL_COMM_BACKEND_UNAVAILABLE 2016-03-24 12:00:03 +01:00
Kaveh Vahedipour 8bc6d193c4 Remerge from devel into agency for integration into cluster 2016-03-24 11:17:59 +01:00
Kaveh Vahedipour a6bd03c609 Fixing VS 2015 warnings and errors 2016-03-24 10:46:00 +01:00
Kaveh Vahedipour c1a5b56061 Fixing VS 2015 warnings and errors 2016-03-24 10:38:50 +01:00
jsteemann 8f4a3be165 cppcheck 2016-03-23 23:06:18 +01:00
Jan Steemann c3678ea845 prevent startup errors due to uninitialized variable 2016-03-23 20:24:00 +01:00
Kaveh Vahedipour 6e31d0374d need to log all changes of term in agency 2016-03-23 19:16:21 +01:00
Kaveh Vahedipour f774a3969a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-23 19:14:49 +01:00
Jan Steemann 3ccf593565 fixed potential shutdown issue 2016-03-23 19:07:21 +01:00
Kaveh Vahedipour ef2fe19cbf Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-23 19:05:53 +01:00
Kaveh Vahedipour 80e7828a97 need to log all changes of term in agency 2016-03-23 19:05:34 +01:00
Andreas Streichardt 96a5c89b9f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-23 18:36:45 +01:00
Andreas Streichardt 8cdf8eebad More python fixes 2016-03-23 18:36:22 +01:00
Jan Steemann 0fe550a8b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-23 18:31:44 +01:00
Jan Steemann cb860d39e9 added assertions 2016-03-23 18:31:26 +01:00
Andreas Streichardt fb76cc4529 fix python 2016-03-23 18:25:41 +01:00
Jan Steemann 6abcc57459 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-23 18:14:12 +01:00
Jan Steemann da1721f262 added assertions 2016-03-23 18:14:03 +01:00
Kaveh Vahedipour b1a8f1611b fixed random compile warnings 2016-03-23 18:06:56 +01:00
Kaveh Vahedipour 90a085975d missing overrides 2016-03-23 17:39:16 +01:00
Kaveh Vahedipour 7746fbfe82 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-23 17:19:56 +01:00
Kaveh Vahedipour 599abfb415 repaired redirection in public agency api 2016-03-23 17:19:46 +01:00
Frank Celler 212a1e7813 fixed buffer overflow 2016-03-23 16:41:22 +01:00