1
0
Fork 0
Commit Graph

114 Commits

Author SHA1 Message Date
Frank Celler 963578180a cleanup of TRI_ options 2016-02-23 12:26:10 +01:00
Michael Hackstein e0f0a6f1a8 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-29 14:18:05 +01:00
Michael Hackstein 436c377cb5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-29 14:01:53 +01:00
Max Neunhoeffer 238937128a Merge branch 'devel' into ClustUp2 2016-01-29 13:59:11 +01:00
Michael Hackstein 08101cbe47 Fixed logic bug in creation of unique hash index 2016-01-27 17:27:11 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Max Neunhoeffer 887e571a26 Merge branch 'devel' into ClustUp2 2016-01-26 18:01:42 +01:00
Michael Hackstein 6f4d8ca509 Fixed invalid storage of Collection status in Cluster 2016-01-26 17:19:37 +01:00
Michael Hackstein 521816670f Simplyfied a function call and thereby removed TRI_json_t in v8-vocindex 2016-01-26 13:37:50 +01:00
Michael Hackstein 969ac75d19 Removed all TRI_json_t references from v8-vocindex and all it's surroundings 2016-01-26 13:27:21 +01:00
Michael Hackstein 5b2062b4e4 Removed legacy toJson function from Index.h. All callers now use VelocyPack directly 2016-01-25 11:42:31 +01:00
Michael Hackstein 191c2dc3a9 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-21 16:29:38 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
Michael Hackstein 3c6ac9f38f Removed all TRI_json_t inputs to AgencyComm and replaced them by VPack. This commit stil has an error s.t. indexes cannot be dropped in Cluster. WIP. 2016-01-20 12:53:55 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
jsteemann f66eb007cd some const unification 2016-01-15 00:03:03 +01:00
Max Neunhoeffer b0283077db Merge branch 'devel' into ClustUp2 2016-01-11 11:41:36 +01:00
Max Neunhoeffer e7eae3a73a Merge branch 'devel' into ClustUp2 2016-01-11 11:01:45 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
Jan Steemann 8b4b6a1943 moved docu blocks into their own files 2016-01-07 16:03:17 +01:00
Wilfried Goesgens 7fc4b356e4 Revert formattings that break documentation parts. 2016-01-07 15:12:04 +01:00
Wilfried Goesgens 8a0f635dca Wrap examples properly - this was broken during the auto format. 2016-01-07 13:08:50 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
jsteemann e5db136f99 internal function signature cleanup 2016-01-05 01:12:11 +01:00
Max Neunhoeffer 0e99d99ec6 Fix bug in shard distribution. 2015-12-29 15:48:13 +01:00
Max Neunhoeffer e81af6274a Add replicationFactor and replicationQuorum. 2015-12-28 14:47:27 +01:00
Jan Steemann e2e483e06a potential fix 2015-12-22 12:34:48 +01:00
Max Neunhoeffer 9d303b69d7 Merge branch 'devel' into vpack 2015-12-21 09:47:42 +01:00
Max Neunhoeffer 0cf659aca2 Allow to set id at collection creation in cluster. 2015-12-21 09:46:50 +01:00
Jan Steemann 3cfd8214a9 handle id and isSystem when creating collections 2015-12-18 20:16:39 +01:00
Jan Steemann ba2ed30093 fix collection creation 2015-12-18 11:35:15 +01:00
Michael Hackstein 3c4643993d Fixed JS constructor for Edge Collections. The collection did not mention that it wants to be an edge collection 2015-12-17 15:06:20 +01:00
Michael Hackstein c49876bf23 Fixed uninitialized access in VocbaseCollectionInfo constructor 2015-12-17 14:41:13 +01:00
Michael Hackstein f708becba1 Fixed VPack parser error during startup 2015-12-17 11:31:20 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
Michael Hackstein 82eea28fea Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-16 19:03:15 +01:00
Michael Hackstein a1c66851da Further adoptions to the VocbaseCollectionInfo class in V8Server 2015-12-16 18:53:47 +01:00
Michael Hackstein 7f0792ab9b Started adapting the V8Server file to class version of TRI_col_info_t 2015-12-16 11:46:18 +01:00
Jan Steemann a694b7ef48 make_unique 2015-12-16 11:36:35 +01:00
Max Neunhoeffer 8a69ca5367 Merge branch 'devel' into ClustUp1 2015-12-15 09:23:51 +01:00
Jan Steemann 84fae4ebcb Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-14 18:16:30 +01:00
Jan Steemann 8e7ac689a2 issue #1606: fail gracefully on invalid index definitions 2015-12-14 16:58:05 +01:00
Max Neunhoeffer 7641feeb88 Fix ClusterComm library w.r.t. pointers. 2015-12-14 11:22:30 +01:00
Max Neunhoeffer ea72850aeb Fix bug in client tests. 2015-12-09 23:13:26 +01:00
Max Neunhoeffer b76d7d6a0c Use new ObjectBuilder. 2015-12-09 15:45:52 +01:00
Michael Hackstein acadb089ee Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-09 10:29:13 +01:00
Max Neunhoeffer a0f6a3c9db Merge branch 'devel' into ClustUp1 2015-12-08 23:21:46 +01:00
Max Neunhoeffer 6cedb210df First try to fix deadlock problem. Tests not yet tried. 2015-12-08 18:54:05 +01:00
Jan Steemann 76d5f57af0 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-08 18:23:06 +01:00