Michael Hackstein
|
82edb8707a
|
Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types
|
2016-08-30 10:12:36 +02:00 |
jsteemann
|
bd590fb62d
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types
|
2016-08-30 08:18:34 +02:00 |
Michael Hackstein
|
7cf7b89c6d
|
Removed more usage of VocbaseCollectionInfo and replaced it by LogicalCollection. It's getting better now. State still not green.
|
2016-08-29 18:44:34 +02:00 |
Kaveh Vahedipour
|
c53428ce89
|
minor fixes
|
2016-08-29 17:13:33 +02:00 |
jsteemann
|
37258adb57
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types
|
2016-08-26 16:37:25 +02:00 |
Kaveh Vahedipour
|
fb6e651525
|
Adding Foxx access to agency
|
2016-08-26 16:28:42 +02:00 |
Kaveh Vahedipour
|
e07543c2e2
|
Adding Foxx access to agency
|
2016-08-26 16:25:03 +02:00 |
jsteemann
|
22b1b7b7e7
|
added unload() functionality for indexes (untested)
|
2016-08-26 14:00:03 +02:00 |
jsteemann
|
4b53310189
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream
|
2016-08-26 13:42:40 +02:00 |
Kaveh Vahedipour
|
b409a1ff25
|
Adding Foxx access to agenc
|
2016-08-26 13:35:39 +02:00 |
jsteemann
|
257aefc5c5
|
fix agency shutdown
|
2016-08-25 14:06:08 +02:00 |
jsteemann
|
c6efe26198
|
cppcheck
|
2016-08-25 14:04:23 +02:00 |
jsteemann
|
667dc8af49
|
fix agency shutdown
|
2016-08-25 14:04:11 +02:00 |
jsteemann
|
07055384b8
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
|
2016-08-24 17:34:59 +02:00 |
Andreas Streichardt
|
89ebeefbb9
|
Proper shutdown
|
2016-08-24 13:51:23 +02:00 |
jsteemann
|
6fc162d5a1
|
fix compile errors after merge
|
2016-08-24 09:44:05 +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 |
Kaveh Vahedipour
|
be51564141
|
updated agency pool
|
2016-08-23 15:57:13 +02:00 |
Jan Christoph Uhde
|
1febeadfd7
|
finish ResponseCode enum
|
2016-08-23 15:46:42 +02:00 |
Kaveh Vahedipour
|
fb8173b1ec
|
rest handler now timeouts when no leadership established and reports 503
|
2016-08-23 15:38:32 +02:00 |
Jan Christoph Uhde
|
d3654d99d8
|
finish RequestType enum
|
2016-08-23 14:49:29 +02:00 |
Andreas Streichardt
|
a9253c7ba5
|
Coorect agency path (no more / duplicates)
|
2016-08-23 14:03:41 +02:00 |
Andreas Streichardt
|
47a0f8602a
|
Better shutdown handling
|
2016-08-23 12:51:38 +02:00 |
jsteemann
|
5f06a5c025
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
|
2016-08-23 12:13:08 +02:00 |
jsteemann
|
405a66a269
|
fix default value for compactionStepSize
|
2016-08-23 12:08:10 +02:00 |
jsteemann
|
817fa1cdf4
|
Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache
|
2016-08-23 12:04:31 +02:00 |
Andreas Streichardt
|
374f24fbd7
|
Remove implicit cast
|
2016-08-22 11:05:19 +02:00 |
Kaveh Vahedipour
|
bb70ed3b8f
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
|
2016-08-19 18:00:21 +02:00 |
Kaveh Vahedipour
|
7c706ecdc8
|
weekend edition
|
2016-08-19 17:59:58 +02:00 |
Mark
|
3bd5c27c0c
|
changes for Visual Studio
|
2016-08-19 17:22:57 +02:00 |
Andreas Streichardt
|
66e1bf7e4a
|
Introduce --agency.my-address
|
2016-08-19 16:20:10 +02:00 |
jsteemann
|
ff45c3fd07
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
|
2016-08-19 15:19:51 +02:00 |
Kaveh Vahedipour
|
168431b6ba
|
dumb warnings
|
2016-08-19 14:29:57 +02:00 |
Kaveh Vahedipour
|
761b986312
|
warnings and correct handling of pool size
|
2016-08-19 14:19:56 +02:00 |
Kaveh Vahedipour
|
4570320a5b
|
dumb warnings
|
2016-08-19 13:44:01 +02:00 |
Michael Hackstein
|
96f11c7e9f
|
Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types
|
2016-08-19 12:26:07 +02:00 |
Kaveh Vahedipour
|
b865f3a41c
|
pool size default
|
2016-08-19 11:13:25 +02:00 |
jsteemann
|
c5f151da5c
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
|
2016-08-19 11:01:15 +02:00 |
Kaveh Vahedipour
|
4177f6bef0
|
gossipping logs move from debug to trace
|
2016-08-19 10:59:26 +02:00 |
Kaveh Vahedipour
|
93995eba84
|
agency startup changed to bootstrapping
|
2016-08-19 10:45:52 +02:00 |
Kaveh Vahedipour
|
fc67a7783f
|
shutdown fixed
|
2016-08-19 10:26:57 +02:00 |
Kaveh Vahedipour
|
d8cb8a33ac
|
pushing corrected unittest script and cluster startup scripts
|
2016-08-19 09:49:44 +02:00 |
Kaveh Vahedipour
|
d54c090a01
|
missing source file added
|
2016-08-19 08:41:19 +02:00 |
Kaveh Vahedipour
|
b3ba9be57f
|
we have a bootstrapping agency
|
2016-08-19 06:05:33 +02:00 |
Kaveh Vahedipour
|
0bdfdc7cb6
|
votes are processed correctly again
|
2016-08-19 05:11:52 +02:00 |
Kaveh Vahedipour
|
11776faa54
|
correct persistence after agency activation
|
2016-08-18 18:23:20 +02:00 |
Kaveh Vahedipour
|
15d2e9285c
|
it seems as if the bootstrap is good to go
|
2016-08-18 17:24:32 +02:00 |
jsteemann
|
d7b2141da0
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
|
2016-08-18 16:22:00 +02:00 |
Kaveh Vahedipour
|
9cbffca282
|
accidentally commented out reportIn mutex_locker
|
2016-08-18 16:06:47 +02:00 |