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

2108 Commits

Author SHA1 Message Date
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Jan Steemann 0c2fdb9fb9 less dependency on document-collection.h 2016-03-04 20:53:17 +01:00
Jan Steemann 1c150d4d6e Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-04 18:35:40 +01:00
Jan Steemann ad4a9542ea removed file 2016-03-04 18:32:54 +01:00
Jan Steemann 4de5e41044 simplifications 2016-03-04 17:48:27 +01:00
Jan Steemann c157363f3c less dependencies 2016-03-04 17:21:09 +01:00
Max Neunhoeffer 4cb42662f3 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-04 15:19:26 +01:00
Max Neunhoeffer e4ce808349 Finish revolution of document API, RestHandler still missing. 2016-03-04 15:16:23 +01:00
Max Neunhoeffer 2654e654db Compiles again, document API not yet sorted out. 2016-03-04 10:32:34 +01:00
jsteemann 630c8f44aa use correct includes 2016-03-04 02:30:47 +01:00
jsteemann cf1427adff smaller datafile markers 2016-03-04 02:25:03 +01:00
Jan Steemann 16588e33d3 less json 2016-03-03 17:30:15 +01:00
Jan Steemann 78f07c6a31 less json 2016-03-03 14:23:39 +01:00
Max Neunhoeffer d2d785ec41 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-03 09:04:54 +01:00
Jan Steemann a09d517d9e fixed warning 2016-03-02 17:55:02 +01:00
Jan Steemann fa759ec787 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 17:51:12 +01:00
Jan Steemann 06da362f93 some json removal 2016-03-02 17:51:05 +01:00
Jan Steemann 4c03f4bf8d simplification 2016-03-02 15:50:52 +01:00
Michael Hackstein d95c4954a4 Removed shape from ExampleMatcher. Also TRI_json_t variant is non functional anymore. It is DEPRECATED and will be removed very very soon 2016-03-02 15:46:32 +01:00
Max Neunhoeffer 0f883dc0c8 Adjust replace to new TRI_V8ToVPack. 2016-03-02 10:53:06 +01:00
Max Neunhoeffer 848860de45 Fix some bugs in replace. 2016-03-01 18:16:26 +01:00
Max Neunhoeffer 2cfa417858 First go at babies variant of replace. RestHandler case missing. 2016-03-01 17:50:13 +01:00
Jan Steemann 298c96f2cc store information about datafile in upper bit 2016-03-01 16:29:09 +01:00
Jan Steemann 3fa4623dd1 made some methods private 2016-03-01 15:53:10 +01:00
Jan Steemann 0cb0c0142f remove _rid from master pointer 2016-03-01 15:06:54 +01:00
Jan Steemann 15350cf4b8 renamed and removed 2016-03-01 12:34:03 +01:00
Max Neunhoeffer ad97830d7f Add babies to insert document API (V8 & HTTP & Transaction). 2016-03-01 10:14:24 +01:00
jsteemann adae2e7c67 fixed saving 2016-02-29 23:31:21 +01:00
Michael Hackstein 11102d4799 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-29 18:00:36 +01:00
Michael Hackstein cb40281543 Unshapified the GeoIndex 2016-02-29 17:58:26 +01:00
Jan Steemann 254f6b49b9 write prologue markers for document & remove markers 2016-02-29 17:08:38 +01:00
Michael Hackstein 6ff12b98db Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-29 15:32:29 +01:00
Michael Hackstein 16750ea55b Replaced OperationCursor by forward declaration 2016-02-29 15:26:52 +01:00
Jan Steemann 18c6fb35e1 removed warning 2016-02-29 15:23:25 +01:00
Jan Steemann 10af07dfcf Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-29 14:24:55 +01:00
Jan Steemann f4f7bcb044 recovery 2016-02-29 14:24:46 +01:00
Michael Hackstein b76c189990 Removed TRI_index_operator and all it's references. They are obsolete because of new VelocyPack index iterator on Skiplist index 2016-02-29 11:42:18 +01:00
Michael Hackstein b478af2f3f Temporarily disabled lookup by skiplist index function. Has to be replimented using AQL instead. 2016-02-29 11:31:48 +01:00
jsteemann 545b0ed6a2 cleanup 2016-02-27 02:44:51 +01:00
jsteemann f0aeab0d12 cleanup 2016-02-27 01:10:42 +01:00
Jan Steemann bd9293802d marker changes, unfinished 2016-02-26 19:39:17 +01:00
Jan Steemann 254a54a470 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 16:24:23 +01:00
Jan Steemann 27fac1e05e removed marker types 2016-02-26 16:24:17 +01:00
Michael Hackstein 7174a6225f Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-26 13:32:10 +01:00
Michael Hackstein ac173ca497 The Edge Index now indexes with VPackSlice instead of TRI_edge_header_t. Some functions that were using the Edge Index are disabled and will not work. These functions have to be modified to use the new Transaction API. 2016-02-26 13:31:10 +01:00
Jan Steemann 88b6828abb re-added single-operation hints 2016-02-26 12:37:12 +01:00
Jan Steemann ebf2d1520b removed TRI_doc_mptr_copy_t 2016-02-26 11:46:33 +01:00
Jan Steemann efc2b26643 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 15:34:32 +01:00
Michael Hackstein 1f5202ad08 Removed obsolte TRI_hash_index_search_value_t. 2016-02-25 15:06:49 +01:00
Jan Steemann 3e82064770 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:59:08 +01:00
Jan Steemann e5140c80a2 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:03:10 +01:00
Jan Steemann 2ee4dad77b TransactionContext is now the resource owner 2016-02-25 14:02:57 +01:00
Michael Hackstein ce1fff1727 Remove unused variables 2016-02-25 13:03:57 +01:00
Jan Steemann e1745608e3 inject attribute translator everywhere 2016-02-25 11:13:32 +01:00
Frank Celler 37a0a7fc05 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 10:56:14 +01:00
Jan Steemann 8f2e2de451 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 10:46:13 +01:00
jsteemann 1823ae4fd2 removed unused forwards and functions 2016-02-25 00:48:06 +01:00
jsteemann 74fa6cf207 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 00:02:03 +01:00
jsteemann 851d19a9d6 logging simplifications 2016-02-25 00:00:18 +01:00
Jan Steemann cd6a9d4988 cleanup 2016-02-24 20:12:46 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Max Neunhoeffer d02ae8e7d1 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-24 15:48:19 +01:00
Max Neunhoeffer aaaa50c6d0 Many index changes, compiles, does not run well. 2016-02-24 15:47:57 +01:00
Michael Hackstein a5442d19f3 Fixed a bug in expandInSearch values. And removed temporary test hack. 2016-02-24 14:46:21 +01:00
Michael Hackstein 9727a1f3a8 Started to add an implementation tu multiply queries with IN. THis is identical for all indexes and does not check validity. The general idea is that an index does not need to know anything about AND, OR, IN. It just has to know primitive types like EQ, LE, LT, GE, GT. 2016-02-24 13:29:26 +01:00
jsteemann e69e37ec97 fixed start 2016-02-23 21:51:02 +01:00
jsteemann ee49f4f3f7 cppcheck 2016-02-23 21:33:59 +01:00
Jan Steemann a27f1efd66 changed resolver handling 2016-02-23 20:27:13 +01:00
Frank Celler bed46519f9 added DETACHED state 2016-02-23 15:27:36 +01:00
Frank Celler 022a5f457c cleanup of TRI_ options 2016-02-23 15:27:35 +01:00
Jan Steemann 70d44f06fa Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 13:22:46 +01:00
Jan Steemann eb202f528c pass vocbase in TransactionContext 2016-02-23 13:03:30 +01:00
Frank Celler a140ad9de2 added DETACHED state 2016-02-23 12:26:12 +01:00
Frank Celler 963578180a cleanup of TRI_ options 2016-02-23 12:26:10 +01:00
Jan Steemann f468cd00ad create transaction context as shared ptr 2016-02-23 12:18:39 +01:00
Jan Steemann 0a969caf23 removed SingleCollectionReadOnlyTransaction and SingleCollectionWriteTransaction 2016-02-23 11:05:44 +01:00
Michael Hackstein 4b4661f2b0 Fixed compiler errors 2016-02-23 09:58:39 +01:00
Michael Hackstein 6d77054a30 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-23 09:44:06 +01:00
Michael Hackstein 535c405bcf First implementation of SimpleQuery ANY in V8 with new transaction API 2016-02-23 09:42:01 +01:00
Jan Steemann 4d9c132a0a moved edgesQuery to AQL/Vpack 2016-02-22 17:50:12 +01:00
Jan Steemann 7efe1c6091 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 16:28:37 +01:00
Jan Steemann 840062af8d all() 2016-02-22 14:03:50 +01:00
Michael Hackstein c9aaabf8e6 Added call to hasMore and getMore on OperationCursor in v8-query 2016-02-22 14:02:25 +01:00
Michael Hackstein e9054fdf29 Added a All iterator for the primary index and made it available in the transaction 2016-02-22 13:25:51 +01:00
Jan Steemann ea3a7f3dab removed cap constraints 2016-02-22 12:37:16 +01:00
Jan Steemann eb8417fcf1 removed first(), last() 2016-02-22 12:26:30 +01:00
Max Neunhoeffer 393ac7e753 Rename getCollectionId -> getCollectionIdLocal. 2016-02-19 23:26:17 +01:00
Michael Hackstein 687bc3c19b Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-19 18:22:24 +01:00
Jan Steemann ee5686b247 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 17:54:37 +01:00
Jan Steemann 40dc74c7f3 fixed warning 2016-02-19 17:54:03 +01:00
Michael Hackstein 65c19c45dd Removed unused function 2016-02-19 16:35:36 +01:00
Jan Steemann 37a98be599 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 12:52:38 +01:00
Michael Hackstein 64c66a53e5 V8-Trancuate now uses new transaction API 2016-02-19 12:50:40 +01:00
Jan Steemann 8b8101fc59 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 11:44:06 +01:00
Jan Steemann adde757e46 move v8 try-catch into handle scopes 2016-02-19 11:42:44 +01:00
Jan Steemann 367c234d96 implemented count() 2016-02-18 17:54:28 +01:00
Michael Hackstein 7ed6754389 Fixed usage of document, to also include customTypeHandler for export to V8 2016-02-18 13:21:06 +01:00
Jan Steemann d7963c651b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 12:55:49 +01:00
Frank Celler 345712c36f changed to new Thread interface 2016-02-17 22:19:37 +01:00
Jan Steemann cb47e07021 removed unused functions 2016-02-17 18:09:22 +01:00
Michael Hackstein 5955e8e1df collection.update() now really uses update... 2016-02-17 17:37:42 +01:00
Michael Hackstein 4baf7c5b49 collection.update and collection.replace now uses the new transaction API respectively. However the underlying functions are not yet implementet 2016-02-17 17:34:28 +01:00
Michael Hackstein 26176ff16f collection.exists uses new Transaction.document API 2016-02-17 17:05:43 +01:00
Michael Hackstein 7bf7363760 collection.document now uses new transaction document API. Still needs custom type handling 2016-02-17 16:56:09 +01:00
Michael Hackstein 19f52c32bf Removed obsolete code in v8-collection 2016-02-17 16:22:09 +01:00
Michael Hackstein abc3b18189 The collection remove function now uses new transaction remove api 2016-02-17 16:19:19 +01:00
Michael Hackstein 79eec5e391 Made the collection save function edge aware. The transaction has to validate that _from and _to are valid. 2016-02-17 11:43:36 +01:00
Michael Hackstein fef2368238 Removed obsolete cluster case insertion function in v8-collection 2016-02-17 10:48:54 +01:00
Michael Hackstein 056bcec709 Reimplemented internal __save to use new Transaction VPack API. Also removed now obsolete static functions 2016-02-17 10:47:19 +01:00
Jan Steemann 0511a944ad implemented local insert method 2016-02-16 18:32:50 +01:00
Jan Steemann 10d2c537a0 use insert() 2016-02-16 17:30:01 +01:00
Jan Steemann a3b0bb83d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-16 15:39:02 +01:00
Jan Steemann 0c4ab9054a API cleanup 2016-02-16 15:13:30 +01:00
Jan Steemann 313f27deed renamed methods 2016-02-15 18:18:03 +01:00
Jan Steemann 242481a501 small code refactoring 2016-02-15 17:02:36 +01:00
Michael Hackstein a3cd1aa54e Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-15 10:25:31 +01:00
Jan Steemann 7ff95c4ec4 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-15 09:36:02 +01:00
Max Neunhoeffer 4cbd99a54b Merge branch 'devel' into ClustUp2 2016-02-13 23:06:22 +01:00
Max Neunhoeffer 1065486a77 First version of getting shards in sync working. 2016-02-13 23:04:20 +01:00
Jan Steemann c3d3ef2b2d use different custom type 2016-02-12 17:29:35 +01:00
Jan Steemann 0089b0fcf6 updated vpack library 2016-02-12 16:33:26 +01:00
Jan Steemann 9898103bc1 initial vpack documents 2016-02-11 21:56:10 +01:00
Jan Steemann dad000b883 use std::string to avoid potential leaks 2016-02-11 10:13:49 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
Jan Steemann 23dfbeee46 optionally restrict logger-follow to a single collection 2016-02-10 16:49:22 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Jan Steemann f552d61f26 added test 2016-02-08 12:00:21 +01:00
Jan Steemann a0cb3b1832 replication changes 2016-02-05 18:06:39 +01:00
Michael Hackstein f5d93fb872 Implemented AQL EDGES as a VPack Variant. 2016-02-05 16:18:21 +01:00
Jan Steemann 071d36c203 replication cleanup 2016-02-05 13:28:38 +01:00
Michael Hackstein 96b75d3733 Added a VPack Implementation for AQL Neighbors. This involved modification of Traverser and ExampleMather to understand VPack as well 2016-02-05 08:45:20 +01:00
Jan Steemann 35a57a194e removed unused variable 2016-02-04 17:05:51 +01:00
Frank Celler 7769b68d69 fixed returns 2016-02-04 16:46:29 +01:00
Frank Celler 8b6f4b8bec removed DEV_APP_PATH 2016-02-04 16:38:20 +01:00
Jan Steemann 699b2435ca fix unnecessary increase of reference counter 2016-02-04 15:07:23 +01:00
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Michael Hackstein 6315ec26a5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-03 10:48:27 +01:00
Max Neunhoeffer ac51c221b3 Merge branch 'devel' into ClustUp2 2016-02-03 08:55:01 +01:00
jsteemann d9de65acf8 remove now useless casts when invoking logger 2016-02-02 21:38:01 +01:00
Jan Steemann 5eb9687e21 turn off deadlock detection in cluster 2016-02-02 14:02:28 +01:00
Jan Steemann bc6fce75d4 removed some unnecessary explicits 2016-02-02 12:13:21 +01:00
jsteemann 3aed47d8e2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-01 13:15:05 +01:00
Michael Hackstein 197292a230 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 13:02:49 +01:00
Max Neunhoeffer daf2afe71a Merge branch 'devel' into ClustUp2 2016-02-01 12:30:45 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
Max Neunhoeffer 0be190d85d Merge branch 'devel' into ClustUp2 2016-02-01 11:43:00 +01:00
Michael Hackstein e0455850fc Replaced doc_mptr_copy with doc_mptr which is the correct type in this case. 2016-02-01 11:40:18 +01:00
Max Neunhoeffer 93400bfdcc Implement followerInfo. 2016-02-01 11:38:10 +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 54c796b6e8 fixed issues identified by `-fsanitize=undefined` 2016-01-31 23:30:41 +01:00
jsteemann b635983d9c removed unused functions and headers 2016-01-31 19:08:39 +01:00
jsteemann ae25d2b53b removed `using namespace std` 2016-01-31 18:22:00 +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 353c9732b7 removed last LOG_xxx macros 2016-01-30 04:03:18 +01:00
jsteemann 9482ee1cca use Logger 2016-01-30 00:08:35 +01:00
jsteemann ff21453255 logger transition: all files in arangod exception transactions.cpp 2016-01-29 23:28:44 +01:00
Jan Steemann 828f46c76b shut up compiler 2016-01-29 19:19:06 +01:00
Jan Steemann cd4cbae6ce ported fixes to devel 2016-01-29 19:05:27 +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
Max Neunhoeffer dcf4ed8bca Sort out FollowerInfo. 2016-01-29 13:56:37 +01:00
Jan Steemann 2112d7c1f8 added override and final specifiers 2016-01-29 11:10:46 +01:00
jsteemann 43639aee79 removed hint about "normal mode" as there is only a normal mode nowadays 2016-01-29 00:50:51 +01:00
Michael Hackstein 582f1f46f0 Preparation for multi-direction traversals. As requested in #1683. Internal traverser can now work with one direction per collection. Next: AQL needs to learn this too. 2016-01-28 14:07:50 +01:00
Jan Steemann 37a083edca Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-27 18:53:29 +01:00
Jan Steemann 585208afcf changed directory name pattern for collections 2016-01-27 18:53:16 +01:00
Michael Hackstein 08101cbe47 Fixed logic bug in creation of unique hash index 2016-01-27 17:27:11 +01:00
Frank Celler 175e1e6b51 moved low level mutex in Mutex class 2016-01-27 15:31:02 +01:00
Max Neunhoeffer 5375ada8a7 Add replicationFactor and replicationQuorum to properties(). 2016-01-27 15:21:55 +01:00
Michael Hackstein 7360cba43a The cursor now returns VPackSlices instead of TRI_json_t 2016-01-27 14:26:36 +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 53d268c843 pacify cppcheck 2016-01-27 09:37:23 +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 b49830c106 Started migrating cursors to VelocyPack 2016-01-26 16:00:29 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +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 f9ada16a89 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-26 13:27:41 +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
Jan Steemann f5d2839bf0 removed reference to unused variable 2016-01-25 18:17:50 +01:00
Michael Hackstein 0a63cb5d48 Removed TRI_json_t from v8-query. 2016-01-25 16:58:53 +01:00
Michael Hackstein bc1b69af70 Fixed error where a nullptr was dereferenced without any checks 2016-01-25 16:00:17 +01:00
Michael Hackstein fb136f2b00 Removed TRI_json_t from V8QueueJob. 2016-01-25 14:57:20 +01:00
Michael Hackstein 5d16679de9 Removed TRI_json_t from baground tasks 2016-01-25 14:45:55 +01:00
Jan Steemann 3dc247e18b fixed segfault 2016-01-25 14:20:06 +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 a6f58ce14d Use forward declarations for VelocyPack instead of all includes everywhere 2016-01-24 14:29:31 +01:00
Michael Hackstein b31cc0ba15 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-22 13:36:47 +01:00
Jan Steemann 9beeb09f37 fix out-of-memory situations 2016-01-22 13:24:33 +01:00
Michael Hackstein 7ef829ae63 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-22 13:16:39 +01:00
Jan Steemann 6b19a7b0a7 fixes ported from 2.8 2016-01-21 16:40:31 +01:00
Michael Hackstein 191c2dc3a9 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-21 16:29:38 +01:00
Michael Hackstein b04f1bf9e2 Replaced IndexOperators using TRI_json_t by Operators using VPack. 2016-01-21 14:07:36 +01:00
Jan Steemann 219da94986 fix some locks 2016-01-21 13:01:31 +01:00
Michael Hackstein 287aadb22c Fixed a bug when creating a new database with users. 2016-01-21 11:00:17 +01:00