1
0
Fork 0
Commit Graph

33039 Commits

Author SHA1 Message Date
Michael Hackstein 3f01c4680d Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again. 2016-08-19 09:51:42 +02:00
Kaveh Vahedipour d8cb8a33ac pushing corrected unittest script and cluster startup scripts 2016-08-19 09:49:44 +02:00
Jan Christoph Uhde 9ba13e757c prepare response for multiple velocypacks 2016-08-19 09:38:35 +02:00
Kaveh Vahedipour f7c05fe72b adjusting startup scripts 2016-08-19 09:08:33 +02:00
Jan Christoph Uhde 104b71fa6f fix bug when trying to copy member form nullptr request
response is generated by simple error so there is no request available
2016-08-19 09:07:00 +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 5ec535bf98 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-19 05:12:06 +02:00
Kaveh Vahedipour 0bdfdc7cb6 votes are processed correctly again 2016-08-19 05:11:52 +02:00
Alan Plum 76c447e29d
Add module.context.createDocumentationRouter 2016-08-19 00:36:08 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
Wilfried Goesgens 74a5e44fda Don't implicitely build the windows packages. 2016-08-18 18:51:15 +02:00
Wilfried Goesgens f0d5af8ae6 remove debug print 2016-08-18 18:48:13 +02:00
Kaveh Vahedipour 11776faa54 correct persistence after agency activation 2016-08-18 18:23:20 +02:00
Wilfried Goesgens eff62c079d Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-18 17:55:35 +02:00
Wilfried Goesgens dadd9833d1 Implement detection whether we are in a git repo and use the toplevel source dir. 2016-08-18 17:53:47 +02:00
Michael Hackstein efce89e3f4 Fixed database/collection lookup in cluster. It did not get the correct vocbase when using a Database other than _system 2016-08-18 17:39:25 +02:00
jsteemann 1b11096060 remove Json/JsonHelper/TRI_json_t 2016-08-18 17:28:43 +02:00
Kaveh Vahedipour c4bff54771 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-18 17:25:24 +02:00
Kaveh Vahedipour 15d2e9285c it seems as if the bootstrap is good to go 2016-08-18 17:24:32 +02:00
jsteemann 21dd73074a cppcheck 2016-08-18 16:57:55 +02:00
jsteemann 06b600a632 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 16:51:02 +02:00
jsteemann 516823059b updated generated file 2016-08-18 16:49:47 +02:00
jsteemann b8bc3b2592 fixed docs 2016-08-18 16:49:34 +02:00
jsteemann d7b2141da0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 16:22:00 +02:00
jsteemann 1cfee8059a remove TRI_json_t remainders 2016-08-18 16:13:52 +02:00
Kaveh Vahedipour 9cbffca282 accidentally commented out reportIn mutex_locker 2016-08-18 16:06:47 +02:00
Wilfried Goesgens 7250db8830 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-18 15:59:12 +02:00
Wilfried Goesgens a89e612723 Work on the NSIS client package 2016-08-18 15:58:13 +02:00
Wilfried Goesgens 976b25b745 We nowadays install to /usr/share/arangodb3/ 2016-08-18 15:57:33 +02:00
Wilfried Goesgens 19aac9704f - add Ninja build approach for windows
- export the location of the ICU data file - the client packages may need them.
2016-08-18 15:56:35 +02:00
Kaveh Vahedipour aee9548308 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-18 15:55:51 +02:00
Kaveh Vahedipour 1940642c2c AgentConfiguration needed to handle its own read/write locks 2016-08-18 15:55:38 +02:00
Kaveh Vahedipour 6edc1ff5fa AgentConfiguration needed to handle its own read/write locks 2016-08-18 15:54:42 +02:00
Wilfried Goesgens 238b2a6f35 Work on building the packages script controlled. 2016-08-18 15:54:23 +02:00
Michael Hackstein 793a157b16 Fixed Cluster constructor of logical collection. 2016-08-18 15:18:12 +02:00
Andreas Streichardt dc74a0b681 Throw exceptions to avoid any circus behaviour 2016-08-18 14:52:45 +02:00
Andreas Streichardt 26543eb8a1 Add changes from 3.0 2016-08-18 13:59:49 +02:00
Simran Brucherseifer dd37b5d3f3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-18 13:31:11 +02:00
Simran Brucherseifer 4b3a8baa44 FOXX -> Foxx 2016-08-18 13:30:18 +02:00
Simran Brucherseifer 08ad5b6f3d Docs: update header (improve tooltips) 2016-08-18 13:29:03 +02:00
hkernbach dcbd02ab03 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-08-18 13:16:42 +02:00
Andreas Streichardt 887da49edf Fix segfault when backend fails 2016-08-18 13:02:55 +02:00
hkernbach a4f063ca5d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-08-18 12:42:04 +02:00
Michael Hackstein 54fa504cc2 Fixed compile warning 2016-08-18 12:38:58 +02:00
Michael Hackstein d3ba488271 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-18 12:38:07 +02:00
Andreas Streichardt e7dd194129 Wow...tried waiting for cluster members to shutdown...forgot to set bool flag...fail 2016-08-18 12:25:25 +02:00
Wilfried Goesgens 7b67a17f64 style fixes 2016-08-18 11:47:48 +02:00
jsteemann 370093d37f removed unused method 2016-08-18 11:47:27 +02:00
Jan Christoph Uhde 4d80deebbf Merge remote-tracking branch 'origin/obi-velocystream' into obi-velocystream-test
* origin/obi-velocystream:
  must lower case header keys
2016-08-18 11:45:04 +02:00