1
0
Fork 0
Commit Graph

8009 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 1e6d47700a visualstudio compatibility of std::chrono::duration<double,std::ratio<1,1>> missing. 2016-03-29 14:11:01 +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 173a6010b5 VisualStudio warnings 2016-03-29 13:01:23 +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
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
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
Jan Steemann cb860d39e9 added assertions 2016-03-23 18:31:26 +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 599abfb415 repaired redirection in public agency api 2016-03-23 17:19:46 +01:00
Kaveh Vahedipour d239fb8e7f merging into devel 2016-03-23 15:36:48 +01:00
Kaveh Vahedipour 67a2541d25 Fixing override finals 2016-03-23 15:18:30 +01:00
Kaveh Vahedipour 7254ad4c9e Fixing issues 2016-03-23 15:16:47 +01:00
Andreas Streichardt 0ab683d1f8 Fix override warnings 2016-03-23 14:49:23 +01:00
Kaveh Vahedipour 9677db67a6 turning off lights in agency? 2016-03-23 11:44:46 +01:00
Kaveh Vahedipour f8cbfa9d3b fixed entirely broken arangod 2016-03-23 10:33:42 +00:00
Kaveh Vahedipour 9e077e2293 Merge branch 'agency' of https://github.com/arangodb/arangodb into agency 2016-03-23 10:05:34 +01:00
Kaveh Vahedipour 342ca3e383 merging into devel 2016-03-23 10:05:14 +01:00
Kaveh Vahedipour 0d15a3ceaf No need for hexdump header anymore 2016-03-23 08:58:31 +00:00
Kaveh Vahedipour bab4816e8f Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-23 09:40:16 +01:00
Kaveh Vahedipour e3cc35ccf6 pulling into devel 2016-03-23 08:43:06 +01:00
Jan Steemann e8c09f3cc1 added missing reset functionality for nested traversals 2016-03-22 18:58:08 +01:00
Kaveh Vahedipour 7f76eb64cb first really usable multi-host agency 2016-03-22 13:34:19 +01:00
Kaveh Vahedipour ccb517fac7 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-22 08:15:33 +01:00
Max Neunhoeffer ee9666e845 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-03-21 23:02:59 +01:00
Max Neunhoeffer cc76ffc5d2 Fix bug that callback was not called for singleRequest case in ClusterComm. 2016-03-21 23:00:44 +01:00
Kaveh Vahedipour 4a86d26f19 need to find out how to define the headers properly 2016-03-21 18:23:14 +01:00
Kaveh Vahedipour 2583c00859 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-21 10:41:15 +01:00