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

8038 Commits

Author SHA1 Message Date
Max Neunhoeffer bca482661a Factor out buildDocumentIdentity. 2016-02-19 11:56:44 +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
jsteemann 62130d3239 locking-related bugfixes 2016-02-19 00:31:28 +01:00
Max Neunhoeffer a62a23d167 Fix compilation. 2016-02-18 23:09:07 +01:00
Max Neunhoeffer 5fccaecc67 Add API for Transaction::indexScan. 2016-02-18 22:34:53 +01:00
Max Neunhoeffer 092d96db08 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-18 21:26:29 +01:00
Jan Steemann b349e80bbd Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 17:54:40 +01:00
Jan Steemann 367c234d96 implemented count() 2016-02-18 17:54:28 +01:00
Max Neunhoeffer cb2b159af3 Add documentCoordinator in Transaction. 2016-02-18 16:54:23 +01:00
Michael Hackstein 7f2e01a180 Fixed usage of old constructor 2016-02-18 16:44:08 +01:00
Michael Hackstein 2b8b2b185f Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-18 16:40:58 +01:00
Jan Steemann 544fc3a31b fixed compile error 2016-02-18 16:34:41 +01:00
Michael Hackstein dffd2e6870 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-18 16:20:34 +01:00
Jan Steemann 5b3b7e673b Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 16:17:07 +01:00
Jan Steemann 157bbe3cf7 fixed replace() 2016-02-18 16:16:54 +01:00
Michael Hackstein 1ddda5f0e8 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-18 16:14:27 +01:00
Michael Hackstein 4e12805846 document PUT and PATCH now use the new Transaction API. 2016-02-18 16:14:23 +01:00
Max Neunhoeffer a66246e6ef Remove old constructors. 2016-02-18 15:57:35 +01:00
Max Neunhoeffer e0ac624b41 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-18 15:33:18 +01:00
Max Neunhoeffer f08f663ec0 Fix constructor call to OperationResult. 2016-02-18 15:33:02 +01:00
Michael Hackstein b7cf8138b3 Fixed Rest generateDocument. It now uses the custom attribute handler for _id 2016-02-18 15:25:13 +01:00
Michael Hackstein 4aa3de6eb8 RestDocument Handler GET now uses new Transaction API 2016-02-18 15:08:57 +01:00
Michael Hackstein b2eb4fdb23 Added helper functions to create HTTP Results from internal VelocyPack 2016-02-18 15:08:33 +01:00
Max Neunhoeffer 27885f75bd Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-18 14:56:59 +01:00
Max Neunhoeffer 52d051d571 Add insertCluster method to transaction. Change OperationResult. 2016-02-18 14:56:37 +01:00
Jan Steemann 9b80a8a371 return _rev in case of revision mismatch for document(), fixed update() 2016-02-18 14:42:38 +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
Michael Hackstein 705742b4bb Fixed custom type for _id 2016-02-18 13:18:58 +01:00
Michael Hackstein 4d044d2732 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-18 12:56:33 +01:00
Jan Steemann d7963c651b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 12:55:49 +01:00
Jan Steemann ea7a7b4242 handle custom types 2016-02-18 12:55:33 +01:00
Michael Hackstein 46d8b291c9 C++ Graph module now uses new Transcation API to get the graph definition 2016-02-18 12:51:08 +01:00
Jan Steemann ba93854c59 check return value 2016-02-18 11:00:39 +01:00
Frank Celler a5e804ab70 added cancel 2016-02-17 22:19:52 +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
Jan Steemann 148d24bdc0 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-17 18:06:47 +01:00
Jan Steemann d6cc325c43 initial implementation of update, still broken 2016-02-17 18:06:35 +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 0b9bb35fc3 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-17 16:11:35 +01:00
Michael Hackstein 2fec9dbef6 Added debug output and stub for replace 2016-02-17 16:11:32 +01:00
Jan Steemann dda2459f41 added document() 2016-02-17 15:59:44 +01:00
Michael Hackstein 68a81872f0 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-17 13:53:41 +01:00
Jan Steemann bdc675e494 added stubs for document() and update() 2016-02-17 13:53:19 +01:00
Michael Hackstein 2b10ec64d3 Adapted RestImportHandler to new Transaction API 2016-02-17 13:49:10 +01:00
Jan Steemann bce6b4f130 remove 2016-02-17 13:41:18 +01:00
Michael Hackstein d25e79cc22 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-17 12:57:12 +01:00
Michael Hackstein 22d30676a5 Moved RestEdgeHandler to new transaction.insert api. Still needs test 2016-02-17 12:57:06 +01:00
Jan Steemann 39e64150e4 stubs for remove() 2016-02-17 12:14:21 +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
Michael Hackstein 11046e30a9 Explicitly give the Collection Type for HTTP generate saved result 2016-02-17 09:39:11 +01:00
Jan Steemann 0511a944ad implemented local insert method 2016-02-16 18:32:50 +01:00
Michael Hackstein a75814264c Use static internal attribute Names instead of inplace strings 2016-02-16 18:17:26 +01:00
Michael Hackstein fb3fbc863f Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-16 17:57:54 +01:00
Michael Hackstein 373f860230 Wrapped the RestDocument Handler around the new Transaction Insert function 2016-02-16 17:57:46 +01:00
Jan Steemann 10d2c537a0 use insert() 2016-02-16 17:30:01 +01:00
Michael Hackstein 35c77083c0 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-16 17:29:22 +01:00
Michael Hackstein 6b8fcfa76b Added a generate saved result for the new Transaction result 2016-02-16 17:07:12 +01:00
Jan Steemann 46195bd3c9 added wasSynchronous flag 2016-02-16 16:41:50 +01:00
Jan Steemann 7127f54981 moved options into separate header 2016-02-16 16:23:28 +01:00
Jan Steemann e1817ac3b7 commented header 2016-02-16 16:04:09 +01:00
Jan Steemann 7a8968348f comments in header 2016-02-16 15:56:38 +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
Michael Hackstein b93e56031b Fixed handling of Null Bytes in AqlValue for VPack. 2016-02-16 13:54:02 +01:00
Michael Hackstein 85b38d09b9 Fixed double free bug in cluster case 2016-02-16 11:34:26 +01:00
Michael Hackstein 116f8a822c Fixed typos in Attribute Names for toVelocyPack. 2016-02-16 11:15:53 +01:00
Michael Hackstein f32750e1ac Removed obsolete toJson from AQL Nodes 2016-02-16 10:29:38 +01:00
Michael Hackstein f767636f14 Added a toVelocyPack serialisation to all Aql Nodes and their dependencies. Right now in parallel to toJson. 2016-02-16 00:04:32 +01:00
Michael Hackstein 86fc1267e7 Removed obsolete Json imports 2016-02-15 23:58:06 +01:00
Jan Steemann 313f27deed renamed methods 2016-02-15 18:18:03 +01:00
Michael Hackstein 4a7bc9ad95 Removed unnecessary JSON 2016-02-15 17:48:20 +01:00
Jan Steemann 242481a501 small code refactoring 2016-02-15 17:02:36 +01:00
Michael Hackstein bb264d89f8 Removed VPackSlice const from std::containers. It is against the standard and compiles somehow with clang but not with g++4.9 2016-02-15 11:21:40 +01:00
Michael Hackstein 2c6c31004c Silenced parentheses warning 2016-02-15 10:53:35 +01:00
Michael Hackstein 835e077836 Fixed a linux compile bug with default parameters. Now they have no defaults any more. 2016-02-15 10:51:12 +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
Michael Hackstein c8e0d417ba Added VPack Variant for IS_SAME_COLLECTION. This was the function without a VelocyPack variant. AQL Functions are now ready to be switched. 2016-02-13 14:46:32 +01:00
Michael Hackstein a52e70c3f5 Added a VPack Variant for AQL FULLTEXT function 2016-02-13 14:40:10 +01:00
Michael Hackstein bfddd69a03 Added a velocypack variant of POSITION and RANGE. 2016-02-13 14:30:43 +01:00
Michael Hackstein 521be3c08e Added VPack variant of PERCENTILE and MEDIAN 2016-02-13 14:15:09 +01:00
Michael Hackstein 0688392364 Added a velocypack variant of stdDev and variance to AQL 2016-02-13 14:00:40 +01:00
Michael Hackstein 8cbac0258a Added VPack implementation for NotNull, CurrentDatabase and CollectionCount 2016-02-13 13:48:34 +01:00
Jan Steemann b734e4c228 don't log to the same output multiple times 2016-02-12 19:12:56 +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 af72cadd19 don't log vpack init message 2016-02-12 12:23:36 +01:00
Jan Steemann 81fe7dd4b8 don't log to same output channel multiple times 2016-02-12 12:22:56 +01:00
Jan Steemann b739708f1d Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-12 11:32:39 +01:00
Jan Steemann b8849daa50 fix invalid fix 2016-02-12 10:41:09 +01:00
Jan Steemann 797fff14c2 fixed issue #1722 2016-02-12 09:45:32 +01:00
Jan Steemann 16d1a6f7a8 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-11 21:56:50 +01:00
Jan Steemann 9898103bc1 initial vpack documents 2016-02-11 21:56:10 +01:00
Kaveh Vahedipour fe9370afb4 Pre merge into devel 2016-02-11 13:00:50 +01:00
Jan Steemann dad000b883 use std::string to avoid potential leaks 2016-02-11 10:13:49 +01:00
Max Neunhoeffer fc3f9f2b99 Merge branch 'devel' into ClustUp2 2016-02-11 09:27:28 +01:00
Jan Steemann 49767bb95a replicate transaction marker 2016-02-11 09:26:47 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
Max Neunhoeffer 8b98ae5ef5 Snapshot for merging. 2016-02-11 09:11:00 +01:00
jsteemann bee34da616 make replace-or-with-in rule fire in more cases 2016-02-10 23:07:24 +01:00
Michael Hackstein 30547cb696 Further implementation if list functions in VPack variant. Also fixed a bug in FIRST 2016-02-10 21:56:09 +01:00
Michael Hackstein a3cccc14cf Added implementation for VPack variant of POP and APPEND 2016-02-10 18:55:28 +01:00
Michael Hackstein acbc7cdad2 Added more VPackStyle functions: firstDocument firstArray push. 2016-02-10 18:14:13 +01:00
Jan Steemann c619935874 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-10 16:49:45 +01:00
Jan Steemann 23dfbeee46 optionally restrict logger-follow to a single collection 2016-02-10 16:49:22 +01:00
Frank Celler 0852c941a9 trying to fix stuch SSL connect 2016-02-10 16:33:17 +01:00
Jan Steemann f50ddf030b fix collapsing of conditions 2016-02-10 12:58:58 +01:00
Jan Steemann f3107bc25f Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-10 11:34:40 +01:00
Jan Steemann 5ba2432d78 remove sort in more cases 2016-02-10 11:23:11 +01:00
Max Neunhoeffer 88074e52cc Activate _docColls. 2016-02-10 08:38:08 +01:00
Kaveh Vahedipour 6fe2dd2465 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-09 16:59:39 +01:00
Michael Hackstein 7976903c43 Added VPack implementations for Math functions. 2016-02-09 16:51:04 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Max Neunhoeffer fb17ac372b Report new follower to agency. 2016-02-09 15:51:58 +01:00
Jan Steemann 53ba1deb55 remove unnecessary code 2016-02-09 11:37:12 +01:00
Jan Steemann 39c3d3d2a2 wait until applier has started 2016-02-09 10:54:37 +01:00
Kaveh Vahedipour 5acf990e8f Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-09 09:57:33 +01:00
Frank Celler 0e3ec4fa6a fixed TRI_doc_mptr_t 2016-02-08 23:38:41 +01:00
Kaveh Vahedipour 8e07620109 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-08 17:10:37 +00:00
Jan Steemann 4bc33cafaf fixed leak 2016-02-08 18:06:11 +01:00
Jan Steemann 0d4d5f5f93 fixed stringification of query states 2016-02-08 17:06:28 +01:00
Jan Steemann 82a84054ba fixed leak 2016-02-08 16:29:09 +01:00
Kaveh Vahedipour b99970ef72 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-08 16:17:36 +01:00
Kaveh Vahedipour c626ecc59b First successful OSX build 2016-02-08 16:17:10 +01:00
Jan Steemann e6ff2a5100 disable copy construction 2016-02-08 16:14:22 +01:00
Jan Steemann f552d61f26 added test 2016-02-08 12:00:21 +01:00
Jan Steemann b7941f3142 added assertions 2016-02-08 09:57:11 +01:00
Jan Steemann 15c5dcf6ac change barrier type 2016-02-07 19:54:10 +01:00
Jan Steemann 42c4bdbebb ported from 2.8 2016-02-07 19:47:37 +01:00
Jan Steemann 7ecf38cc38 fixed leak 2016-02-07 17:37:27 +01:00
jsteemann 0c39095037 pass Json by const reference 2016-02-07 10:07:34 +01:00
jsteemann 7cdd48c48f fix init order fiasco 2016-02-07 10:07:14 +01:00
jsteemann 63595cd740 forward port from 2.8 2016-02-07 00:35:02 +01:00
jsteemann 79cc85debd fixed leak 2016-02-07 00:23:57 +01:00
jsteemann a02e2b563f fixed issue #1707: 2.8.1 crashes 
the crash was due to a required variable being removed from the execution plan.
this happened when there were multiple execution plans, and a certain transformation
was made in one of them. the transformation modified an element that was shared by
all plans, but it should have made a copy so only the current plan is affected
 2016-02-07 00:23:34 +01:00
jsteemann 6acd2e83b6 report an error when "the impossible" (tm) happens 2016-02-07 00:23:11 +01:00
jsteemann a5c23fe0fe fix parsing forward ticks, fix line numbers in some error messages 2016-02-06 12:32:14 +01:00
jsteemann f28fb0c198 allow enclosing identifiers in forward ticks, too 2016-02-06 01:48:33 +01:00
jsteemann be5d6fe756 remove obsolete functionality 2016-02-06 01:13:36 +01:00
jsteemann 371a9fd046 prevent lock from being moved from one thread to another 2016-02-06 00:37:32 +01:00
Jan Steemann 206dddc701 fixed potential leak 2016-02-05 21:32:26 +01:00
Jan Steemann 040b09f303 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-05 19:47:29 +01:00
Jan Steemann 16df093e8f added barrier query API 2016-02-05 18:20: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
Michael Hackstein dcd275181f Added VPack Variant of DOCUMENT() 2016-02-05 14:37:33 +01:00
Jan Steemann 1e7b43b3df make initial synchronization fail when master is restarted in the middle and no progress can be made 2016-02-05 14:00:49 +01:00
Michael Hackstein 17abd440aa Further implementation of AQL Functions VPack variants. 2016-02-05 13:55:18 +01:00
Jan Steemann 071d36c203 replication cleanup 2016-02-05 13:28:38 +01:00
Jan Steemann abd382bf19 replication cleanup 2016-02-05 13:08:12 +01:00
Jan Steemann d63fa1ad81 use dedicated REPLICATION log channel 2016-02-05 11:01:39 +01:00
Jan Steemann 321230599b stringification of unlimit rlimit values 2016-02-05 10:43:40 +01:00
Michael Hackstein ba9d3566e9 Implemented Geo Functions in VPack variant. Also simplified the code. 2016-02-05 10:22:15 +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 3b1c3cd37d prevent compile warning with clang 2016-02-04 19:31:44 +01:00
Jan Steemann 94990da5f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-04 19:18:43 +01:00
Jan Steemann 8584a2a7af treat unlimited rlimit values specially 2016-02-04 18:34:39 +01:00
Jan Steemann a71f65f873 potential fix 2016-02-04 18:05:48 +01:00
Jan Steemann 35a57a194e removed unused variable 2016-02-04 17:05:51 +01:00
Jan Steemann 437160f921 minor datafile statistics correction 2016-02-04 16:54:10 +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 56c3274749 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 15:29:24 +01:00
Jan Steemann 34c402cb05 attempt to fix assertion in Cluster 2016-02-04 15:29:02 +01:00
Michael Hackstein edf7f6b9d9 Further implementation of AQL functions for VPack. UNIQUE UNIQUE_SORTED UNION UNION_DISTINCT 2016-02-04 15:23:26 +01:00
Wilfried Goesgens e68f483177 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-02-04 15:12:13 +01:00
Wilfried Goesgens acc17daa96 Merge branch 'devel-solaris' of https://github.com/doublerebel/arangodb into doublerebel-devel-solaris 
Fix Conflicts:
	arangod/FulltextIndex/fulltext-index.cpp
	lib/Basics/logging.cpp
 2016-02-04 15:11:34 +01:00
Jan Steemann 699b2435ca fix unnecessary increase of reference counter 2016-02-04 15:07:23 +01:00
Michael Hackstein 84b1f9055d Further implementation of VPackAqlValue functions. This included VALUES and ATTRIBUTES. These functions by accident had an ordering in TRI_json_t which they do not have any more in VelocyPack. Clarified Documentation. 2016-02-04 13:49:59 +01:00
m0ppers 8f96fc3d94 Merge pull request #1704 from m0ppers/initializecluster 
Initializecluster
 2016-02-04 13:43:56 +01:00
Andreas Streichardt 63b2cdbe1b fix code review comments 2016-02-04 13:40:15 +01:00
Jan Steemann 3269c59a06 fixed some compile warnings 2016-02-04 12:38:51 +01:00
Andreas Streichardt 40b844c7b0 Merge branch 'devel' of github.com:arangodb/arangodb into initializecluster 2016-02-04 12:33:28 +01:00
Frank Celler b44385d9ef fixed deprecated options 2016-02-04 12:08:23 +01:00
Andreas Streichardt 9e7beb9a6e Change LOG WARNING and ERROR 2016-02-04 11:43:10 +01:00
Jan Steemann 6bac50d372 don't compact in one special case 2016-02-04 11:37:46 +01:00
Andreas Streichardt f096580706 Merge remote-tracking branch 'upstream/devel' into initializecluster 2016-02-04 11:37:02 +01:00
Andreas Streichardt adce528373 Proper initialization 
Also find a fitting spot for our role
 2016-02-04 11:29:43 +01:00
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +01:00
Jan Steemann 657ac8d50f fixes for Windows 2016-02-04 09:36:29 +01:00
Jan Steemann a01e52f4cd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-04 09:07:57 +01:00
Jan Steemann b7fddb15ad handle compile warnings 2016-02-04 09:07:36 +01:00
Max Neunhoeffer 048f523714 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-02-04 09:00:43 +01:00
Max Neunhoeffer 391c03e68a Fix initial value of HTTP response code in ClusterComm. 2016-02-04 09:00:23 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Jan Steemann ac0446faf2 fixed potential truncation of master pointer list when rolling back update operations 2016-02-03 18:51:22 +01:00
Michael Hackstein 14c33024c4 Added more functions for VelocyPack variabt of AqlValue 2016-02-03 14:51:17 +01:00
Michael Hackstein cff759183a Rearranged VPack-AQL-Functions. Preperation for removal of old Functions 2016-02-03 10:53:15 +01:00
Michael Hackstein 6315ec26a5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-03 10:48:27 +01:00