1
0
Fork 0
Commit Graph

26 Commits

Author SHA1 Message Date
jsteemann fa21e70256 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 17:59:54 +02:00
Kaveh Vahedipour 2550dd22e0 fixed issue with leadership in minority 2016-08-31 17:23:48 +02:00
Kaveh Vahedipour c8178239e1 agency configuration persisted to state machine 2016-08-30 14:41:28 +02:00
jsteemann f92815b09b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-24 09:38:06 +02:00
Jan Christoph Uhde 5be5030983 Merge branch 'obi-velocystream-enums' into engine-vs-velocystream
* obi-velocystream-enums:
  clean up - remove enumToEnum magic
  finish ResponseCode enum
  finish  ProtocolVersion, ProtocolType and ConnectionType
  finish ContentType enum
  preapre move of ContentTypes
  finish RequestType enum
  prepare replacement of request types
  even more error messages
  slightly better error messages
  better exceptions form event loop
  mark len constexpr

Conflicts:
	arangod/Agency/Inception.cpp
2016-08-23 16:01:58 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
Kaveh Vahedipour 7c706ecdc8 weekend edition 2016-08-19 17:59:58 +02:00
Kaveh Vahedipour 761b986312 warnings and correct handling of pool size 2016-08-19 14:19:56 +02:00
Kaveh Vahedipour 1a23803238 multiagent gossip 2016-08-16 15:46:00 +02:00
Kaveh Vahedipour 4759b2a434 Agency compiling again 2016-08-11 12:05:53 +02:00
Kaveh Vahedipour a0c02ca29d trying to rebuild agency 2016-08-10 17:08:36 +02:00
Kaveh Vahedipour 46e201fc63 2/3 through new startup 2016-08-09 18:48:45 +02:00
Kaveh Vahedipour 5bdf6fcdb6 2/3 through new startup 2016-08-09 18:40:59 +02:00
Jan Christoph Uhde beae8a8f74 first changes for set/get payload methods ->
toVelocyPack now returns slices
2016-07-15 16:38:13 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Kaveh Vahedipour 1baf2050c6 waitForCommited bug in agency fixed 2016-06-29 14:54:05 +02:00
Frank Celler af0b0900af WIP 2016-05-22 21:08:37 +02:00
Frank Celler 806fce1dec WIP 2016-05-21 21:58:42 +02:00
Frank Celler 9646f736fb clang-format 2016-05-18 14:51:09 +00:00
jsteemann 4691a0868d removed unnecessary iostream includes 2016-05-07 08:06:26 +02:00
Max Neunhoeffer 6ce1c4c613 Fix an uninitialized warning. 2016-05-04 16:01:54 +02:00
Kaveh Vahedipour 181098fe4e solaris ridiculous and random errors 2016-04-26 10:01:36 +02:00
Kaveh Vahedipour 724c5dd6c7 solaris' ineptness 2016-04-25 16:51:54 +00:00
Jan Steemann ecbc263b04 removed unused include 2016-04-22 19:16:31 +02:00
Kaveh Vahedipour 76a0b2d41a cluster startup and supervision 2016-04-18 13:08:49 +02:00