Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
26,356 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

127 Commits

Author SHA1 Message Date
Michael Hackstein a3cd1aa54e Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-15 10:25:31 +01:00
Jan Steemann f552d61f26 added test 2016-02-08 12:00:21 +01:00
Michael Hackstein 197292a230 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 13:02:49 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
Michael Hackstein b85d5d4a26 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 09:49:29 +01:00
Michael Hackstein 9ea8e3ea0c Started to write merge of two slices. This is not yet working for null means delete, works for all other merges. 2016-02-01 09:49:19 +01:00
jsteemann 4e94803ad7 honor results of clang-test, clang-tidy and clang-modernize 2016-01-31 15:56:18 +01:00
jsteemann 2d7323a560 fixed warnings shown by clang-3.7 2016-01-31 02:17:36 +01:00
jsteemann ff21453255 logger transition: all files in arangod exception transactions.cpp 2016-01-29 23:28:44 +01:00
Max Neunhoeffer 238937128a Merge branch 'devel' into ClustUp2 2016-01-29 13:59:11 +01:00
Jan Steemann 585208afcf changed directory name pattern for collections 2016-01-27 18:53:16 +01:00
Max Neunhoeffer 5375ada8a7 Add replicationFactor and replicationQuorum to properties(). 2016-01-27 15:21:55 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Jan Steemann 3d8a52cdf4 some refactoring 2016-01-27 13:28:19 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +01:00
Jan Steemann 9beeb09f37 fix out-of-memory situations 2016-01-22 13:24:33 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
Jan Steemann 5daa529404 compaction fix attempt II 2016-01-18 18:24:25 +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
Michael Hackstein 78d9c6643a Removed some TRI_json_t in v8-collection 2016-01-14 09:18:11 +01:00
Michael Hackstein b45ac55d58 Clang-format fixes 2016-01-12 15:16:04 +01:00
Michael Hackstein 96d58b8a67 Replaced toJson with toVelocyPack in KeyGenerator. 2016-01-12 15:13:34 +01:00
jsteemann debeaeec07 less garbage collection 2016-01-11 12:43:05 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
jsteemann 0bfc9a19ae BE -> AE 2016-01-07 21:09:33 +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 02de75afe0 added option --default-number-of-shards for arangorestore 2016-01-07 10:54:02 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Max Neunhoeffer 225c8cd843 Work on TODOs. 2015-12-22 16:50:09 +01:00
Jan Steemann a3898bd54e fixed test 2015-12-22 11:27:05 +01:00
Max Neunhoeffer e8e6dc8597 More VPackObjectBuilder usages. 2015-12-21 15:22:19 +01:00
Max Neunhoeffer 0743885dec Fix handling of VPackOptions in Parser/Builder usage. 
Also fix TRI_json_t* handling for cluster methods.
 2015-12-18 20:42:59 +01:00
Michael Hackstein 4907eaf66c Fixed wrong usage of V8ToVPack 2015-12-17 15:21:37 +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
Max Neunhoeffer 4451e491ec Merge branch 'devel' into ClustUp1 2015-12-15 17:46:34 +01:00
Jan Steemann ad8381ad6a Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-15 16:37:33 +01:00
Jan Steemann 8ed8681505 updated module name 2015-12-15 16:15:26 +01:00
Jan Steemann 442b614fb5 documentation update 2015-12-15 15:54:58 +01:00
Jan Steemann b123ffbe26 issue #1610 2015-12-15 15:41:50 +01:00
Max Neunhoeffer 7641feeb88 Fix ClusterComm library w.r.t. pointers. 2015-12-14 11:22:30 +01:00
Max Neunhoeffer af4d729284 The ClusterComm C++11 revolution. 2015-12-11 23:26:10 +01:00
Michael Hackstein 1af985003d Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-10 10:26:14 +01:00