1
0
Fork 0
Commit Graph

1353 Commits

Author SHA1 Message Date
Andreas Streichardt 9178e560eb Implement jwt tests 2016-05-31 19:19:10 +02:00
Andreas Streichardt b5f27100b1 oops...JWT should be uppercase in header 2016-05-31 17:22:28 +02:00
Andreas Streichardt 87f09b986a Compiles 2016-05-31 14:28:15 +02:00
Andreas Streichardt 6cb00f905d Merge branch 'devel' into jwt 2016-05-30 18:49:26 +02:00
Andreas Streichardt 5b0055bfbf jwt generation works 2016-05-30 18:47:04 +02:00
Max Neunhoeffer 7943e1567c Add a cast to make Windwos happier. 2016-05-25 15:59:04 +02:00
Frank Celler 3e0930aa16 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-05-24 10:21:18 +02:00
Max Neunhoeffer 611b7f9ee0 Repair resilience for system collections.
Plus a lot of synchronous replication bugfixes.
2016-05-23 14:02:01 +02:00
Frank Celler c441700c20 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-05-22 21:45:40 +02:00
Frank Celler 30ef88df00 WIP 2016-05-22 21:21:04 +02:00
Frank Celler af0b0900af WIP 2016-05-22 21:08:37 +02:00
Frank Celler 806fce1dec WIP 2016-05-21 21:58:42 +02:00
Max Neunhoeffer fa27587124 Add /_api/replication/holdReadLockCollection for sync. replication. 2016-05-21 01:03:14 +02:00
jsteemann 9166d0223f fix rev 2016-05-20 16:04:14 +02:00
jsteemann 2c6166822d fix rev 2016-05-20 15:59:58 +02:00
Max Neunhoeffer d810641ff3 Add a waitForSync in replication. 2016-05-19 14:04:52 +02:00
Jan Steemann 7d4599a056 removed now unneeded API-changes document 2016-05-13 16:04:48 +02:00
Frank Celler 9dbba248de added fillBody 2016-05-13 15:14:44 +02:00
jsteemann 5be32e9fe5 attempt to speed up dumper 2016-05-12 16:46:52 +02:00
Jan Steemann 8e090e642e removed "createCollection" attribute from APIs 2016-05-12 15:17:45 +02:00
jsteemann 3f1516eca7 bugfixes 2016-05-11 15:01:06 +02:00
jsteemann 98f0ad81a6 micro optimizations 2016-05-11 14:06:47 +02:00
jsteemann bfd5596359 optimizations 2016-05-11 11:50:07 +02:00
jsteemann 0ce8599598 fixes for MSVC 2016-05-10 19:01:21 +02:00
jsteemann 30525fccee use StaticStrings 2016-05-10 17:01:34 +02:00
Max Neunhoeffer 39ecd9fd13 Rename prefix and prefixStripped in AgencyComm. 2016-05-10 16:00:07 +02:00
Max Neunhoeffer 825f010980 Rename getValues2 to getValues. 2016-05-10 15:52:54 +02:00
jsteemann f90a9fce18 handle "Connection" and "Content-Type" headers separately 2016-05-10 15:24:55 +02:00
Michael Hackstein ab13d1e3a6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 13:45:20 +02:00
Michael Hackstein 7b8d3d6df7 Insertion of documents in Cluster (babies case) now passes through the X-Arango-Error-Codes. 2016-05-09 12:45:31 +02:00
Jan Steemann 8d6bf61335 fixed restore 2016-05-09 11:55:00 +02:00
Jan Steemann 0bd61cf928 removed option `--server.default-api-compatibility` 2016-05-06 18:38:37 +02:00
Max Neunhoeffer 75f7689a9f Fix arangodump.
RestReplicationHandler::handleCommandClusterInventory was using
getValues instead of getValues2 and the etcd-fake code did not
work properly with objects as values in the agency.
2016-05-04 23:46:09 +02:00
Wilfried Goesgens 4fb12c91b1 Revalidate dispatcher pointer before accessing it and throw appropriate error message if not. 2016-05-03 16:56:50 +02:00
jsteemann db9e3d1360 optimizations 2016-05-03 00:43:39 +02:00
jsteemann b9324ea2a1 use VPackDumper 2016-05-02 17:32:53 +02:00
jsteemann 96fceb4411 use std::unordered_maps for headers 2016-05-01 20:52:47 +02:00
jsteemann 7cd90ae711 micro optimizations 2016-05-01 14:13:53 +02:00
jsteemann 1250fcf63e micro optimizations 2016-05-01 00:03:23 +02:00
jsteemann a1df0c8168 turn waitForSync off during restore 2016-04-30 16:47:29 +02:00
jsteemann e478c1ae11 faster lookup for _key attribute 2016-04-30 13:25:06 +02:00
jsteemann 3a92773685 use StaticStrings 2016-04-29 15:18:20 +02:00
Frank Celler d4f7316b46 more static strings 2016-04-29 11:14:57 +02:00
Frank Celler 1369ad3a6f towards windows service 2016-04-29 11:14:57 +02:00
Michael Hackstein 165d92fc58 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 09:15:09 +02:00
jsteemann b796e4cc7d use some static strings here and there 2016-04-29 01:37:44 +02:00
Michael Hackstein a4541a83ad Generate document in rest handler now works with externals 2016-04-28 17:32:56 +02:00
jsteemann 46fc8a25d4 micro optimizations 2016-04-28 15:41:50 +02:00
jsteemann b9ef307bf1 micro optimizations 2016-04-28 12:04:14 +02:00
Frank Celler 33c96bea86 added application/x-velocypack 2016-04-26 23:01:36 +02:00
jsteemann 46e9db4d4e wal simplifications 2016-04-25 22:31:48 +02:00
Jan Steemann b7f3ab4683 micro optimizations 2016-04-25 17:58:11 +02:00
jsteemann f660587336 fix importing of unsupported index types 2016-04-24 19:15:26 +02:00
jsteemann 5b59b6dacd use generateResult instead of home-made solution 2016-04-23 20:49:43 +02:00
jsteemann 0da9ac7cdc micro optimizations 2016-04-23 16:23:15 +02:00
Jan Steemann 104e8e8b9b remove ArangoServer.h remainders 2016-04-22 20:18:28 +02:00
Jan Steemann 38e543e0a8 cppcheck 2016-04-22 15:51:03 +02:00
Jan Steemann 7d6994862e fixed startup/shutdown with specific features 2016-04-22 14:44:42 +02:00
jsteemann ad0a3f38b0 allow accessing /_admin/log in all databases 2016-04-22 08:41:39 +02:00
Frank Celler ac3a9883b9 restored log buffer feature 2016-04-21 21:07:23 -07:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Jan Steemann 240cb95f0c fixed crash 2016-04-19 15:54:10 +02:00
Michael Hackstein be118b1b80 Former JsonCursor now uses QueryResult and contains the TRX context for continuuos reads 2016-04-19 14:32:23 +02:00
Frank Celler 75d3de2b31 fixed merge 2016-04-19 07:52:02 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
Kaveh Vahedipour 313140e0e1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 15:27:31 +02:00
Michael Hackstein 94ee7b41f8 Removed unneccessary warning 2016-04-18 13:44:11 +02:00
Kaveh Vahedipour 1221326753 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 13:08:56 +02:00
Kaveh Vahedipour 76a0b2d41a cluster startup and supervision 2016-04-18 13:08:49 +02:00
Michael Hackstein 4cf47bf9c4 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-18 12:42:00 +02:00
Michael Hackstein ca64e727a1 Entirely removed TRI_json_t and Json from ClusterMethods and RestEdgesHandler 2016-04-16 23:23:25 +02:00
Michael Hackstein 1c040696b4 Removed unnecessary TRI_json_t in RestReplicationHandler 2016-04-16 22:37:48 +02:00
Frank Celler 2dd798cd48 WIP 2016-04-15 22:09:55 -07:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Michael Hackstein cd12a07a4d Fixed return codes in cluster. They are now forwarded properly from DBServer to Client 2016-04-15 17:58:06 +02:00
Jan Steemann bbfaee3bfe allow specifying collection name prefixes for `_from` and `_to` in arangoimp: 2016-04-15 16:18:23 +02:00
Michael Hackstein 0e2d31f633 Moved GET _api/document?collection=xxx to PUT _api/simple/all-keys {collection: xxx}. Adapted all tests. Also removed Transaction::allKeys which got obsolete by this commit. 2016-04-15 11:23:25 +02:00
Frank Celler 8254bd4bd6 WIP 2016-04-14 21:32:12 -07:00
Michael Hackstein 9d26149187 RestHandler now reacts to NOT_ALL_SHARDING_ATTRIBUTES_GIVEN. This could not occur before. 2016-04-14 10:23:11 +02:00
Frank Celler 0fa6435731 WIP 2016-04-13 21:12:16 +02:00
Michael Hackstein a14d7dffe2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-13 08:30:48 +02:00
Jan Steemann d0296b38e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 18:27:53 +02:00
Jan 7cd428c367 Merge pull request #1798 from ObiWahn/devel
optional velocypack response
2016-04-12 18:27:08 +02:00
Jan Steemann c0fd5c5f78 removal of some JSON 2016-04-12 18:21:11 +02:00
Kaveh Vahedipour 9bd08b98c4 correct callback jsons 2016-04-12 16:01:00 +02:00
Kaveh Vahedipour b44af0ab60 new simple URI form from endpoint 2016-04-12 14:20:47 +02:00
Michael Hackstein 50535f6ad8 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-12 14:12:06 +02:00
Kaveh Vahedipour 0efa889f43 new simple URI form from endpoint 2016-04-12 14:10:18 +02:00
Kaveh Vahedipour 9853b9662c introducing cluster sanity checking to agency 2016-04-12 12:10:46 +02:00
Michael Hackstein 19a861e86d Modify Document now returns X-Arango-Error-Codes header in baby case. 2016-04-11 14:23:03 +02:00
Michael Hackstein 83b13bb8b3 Implemented modifyDocument in cluster with babies. 2016-04-11 10:25:03 +02:00
Jan Christoph Uhde 1977377cc6 prepare two more functions to return velocypack - please review 2016-04-11 01:19:24 +02:00
Jan Christoph Uhde 1d72053587 reviewed by jan 2016-04-10 10:42:56 +02:00
Kaveh Vahedipour c949df2dfc agency compiles after pull from devel 2016-04-08 12:40:38 +00:00
Jan Christoph Uhde c3c403532b client is now able to request velocypack 2016-04-08 13:29:27 +02:00
Jan Steemann e37029aec6 removed unused private variable 2016-04-07 18:52:32 +02:00
Jan Steemann 1855b74aaa added asserts 2016-04-07 16:44:36 +02:00
Jan Steemann 74794d16db Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:43:35 +02:00
Jan Steemann 4b0c01975b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:30:36 +02:00
Frank Celler f6c818a399 removed tolower for NC 2016-04-07 14:15:30 +02:00
Jan Steemann 513dc26fc1 make replication tests more deterministic 2016-04-07 13:00:30 +02:00
Michael Hackstein 015c5d2908 Fixed single-server babies test. Also made sure that the error header is capialized properly 2016-04-07 12:41:23 +02:00
Kaveh Vahedipour 4ae8aae1da redone the single-host and multi-host agency to function in identical way in commiting and confirmation thereof 2016-04-07 12:20:53 +02:00
Jan Steemann 545b87cb76 test fixes 2016-04-06 17:39:24 +02:00
Jan Steemann aae8ffa5e3 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:46:47 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Max Neunhoeffer 836d288c85 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-04-06 10:15:20 +02:00
Max Neunhoeffer cae6b850df Fix addFollower. 2016-04-06 10:15:03 +02:00
Michael Hackstein 98b4c43315 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-06 09:30:11 +02:00
Kaveh Vahedipour f6c5feb5e4 implementing code review: rewrote url generation 2016-04-06 08:58:38 +02:00
Jan Steemann d0f368445a replication fixes 2016-04-05 18:32:09 +02:00
Michael Hackstein a968446820 SingleServer INSERT babies now uses newest format. It tries to insert as much as possible. Reports each document individually. Also reports each error individually. The ordering of documents in request and response is identical. 2016-04-05 15:53:48 +02:00
Kaveh Vahedipour 8bb3b84aed implementing code review 2016-04-05 14:20:07 +02:00
Jan Steemann bd43decab4 replication fixes 2016-04-04 14:55:55 +02:00
Michael Hackstein 4339c6540d Fixed a bug with custom _id attribute in RestSimpleHandle lookupByKeys 2016-04-04 12:48:55 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Michael Hackstein 0f7c2af9dc Fixed undefined behaviour bug if someone tries to delete a document without key and body. 2016-04-01 17:12:22 +02:00
Kaveh Vahedipour 1dba990295 ttl overwrite 2016-04-01 15:10:20 +02:00
Kaveh Vahedipour f013604f47 ttl overwright 2016-04-01 15:01:53 +02:00
Michael Hackstein 91d394105c ClusterResolver cid by numeric name now checks if the number is actually a valid collection and it returns cid 0 instead of the given numeric number. Some apis rely on this to check if collection exists or not. 2016-04-01 14:31:13 +02:00
Kaveh Vahedipour 8ace3c10a3 Overwriting ttls 2016-04-01 14:24:30 +02:00
Michael Hackstein 4637d0ff40 Fixed api/edges in Cluster 2016-04-01 11:38:44 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Frank Celler 1c0492ff8a MSVC fixes 2016-03-31 14:02:02 +02:00
Frank Celler 295c8a3809 MSVC fixes 2016-03-31 14:01:23 +02:00
Kaveh Vahedipour 66d668ba13 merge back from agency 2016-03-31 11:50:05 +00:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Kaveh Vahedipour cdd76c1b89 still ttl in long 2016-03-31 11:53:08 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Kaveh Vahedipour 2ddc1cd8ec i am a teapot if value not found and only a single search string is requested 2016-03-31 11:44:02 +02:00
Kaveh Vahedipour f9cc972cff i am a teapot if value not found and only a single search string is requested 2016-03-31 11:04:10 +02:00
Frank Celler 119c1bd44b Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 09:31:32 +02:00
Kaveh Vahedipour ee97eb769b updating state to AQL 2016-03-30 13:20:19 +02:00
Michael Hackstein 9d70091713 The RestEdges handler now behaves identically to the server side edges() functions. Specifically it does not return duplicate edges any more. Also added a helper function to build an EdgeIndex Lookup from VPackArray. 2016-03-30 10:13:09 +02:00
Kaveh Vahedipour 173a6010b5 VisualStudio warnings 2016-03-29 13:01:23 +02:00
Frank Celler af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
Jan Steemann 1915e39aea Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 15:28:57 +01:00
Kaveh Vahedipour 1bdfe53ec2 Agency write sensitive to X-ArangoDB-Agency-Mode 2016-03-24 14:14:33 +01:00
Kaveh Vahedipour a6bd03c609 Fixing VS 2015 warnings and errors 2016-03-24 10:46:00 +01:00
Kaveh Vahedipour c1a5b56061 Fixing VS 2015 warnings and errors 2016-03-24 10:38:50 +01:00
jsteemann b7c1a42f96 test fixes 2016-03-24 01:12:57 +01:00
jsteemann 1efc83babf Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 23:48:27 +01:00
jsteemann 8f4a3be165 cppcheck 2016-03-23 23:06:18 +01:00
jsteemann 3f3ac72503 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 20:55:01 +01:00
Jan Steemann f7faf536eb merge 2016-03-23 19:12:57 +01:00
Kaveh Vahedipour 80e7828a97 need to log all changes of term in agency 2016-03-23 19:05:34 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Kaveh Vahedipour 599abfb415 repaired redirection in public agency api 2016-03-23 17:19:46 +01:00
Jan Steemann d5d943b4a5 adapt to branch 2016-03-23 17:09:29 +01:00
Jan Steemann 9ac39b7ad6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:30 +01:00
Kaveh Vahedipour d239fb8e7f merging into devel 2016-03-23 15:36:48 +01:00
Kaveh Vahedipour 7254ad4c9e Fixing issues 2016-03-23 15:16:47 +01:00
Kaveh Vahedipour 342ca3e383 merging into devel 2016-03-23 10:05:14 +01:00
Max Neunhoeffer c2049b8ee1 Switch to IndexHandles. 2016-03-23 08:57:00 +01:00
Kaveh Vahedipour 7f76eb64cb first really usable multi-host agency 2016-03-22 13:34:19 +01:00
Jan Steemann 04e7f2dced fixed test 2016-03-22 12:03:25 +01:00
Jan Steemann 9e026655a0 allow generating HTTP responses with TransactionContext 2016-03-22 12:01:02 +01:00
Jan Steemann 31c06b0845 cleanup 2016-03-22 11:48:17 +01:00
Jan Steemann 45cc15fe45 fixes 2016-03-22 10:51:42 +01:00
jsteemann d03170a93f removed unused functionality 2016-03-21 21:41:39 +01:00
jsteemann 4694d36671 cppcheck 2016-03-21 20:56:08 +01:00
Jan Steemann 3da00d24ea test fixes 2016-03-21 18:25:48 +01:00
Kaveh Vahedipour 4a86d26f19 need to find out how to define the headers properly 2016-03-21 18:23:14 +01:00
Jan Steemann 1587fadb82 fixed test 2016-03-21 17:18:41 +01:00
Jan Steemann ce63219435 removed DocumentAccessor 2016-03-21 15:40:44 +01:00
Jan Steemann f458acc4c7 cleanup 2016-03-21 14:35:58 +01:00
Kaveh Vahedipour 41d804d765 need to find out how to define the headers properly 2016-03-21 08:14:58 +01:00
Kaveh Vahedipour 3beb3450b1 catch malformed input. 2016-03-21 08:00:54 +01:00
Kaveh Vahedipour 3d3fb23a62 writing test 2016-03-18 18:59:06 +01:00
Michael Hackstein 25b33b9048 Fixed invalid forward declarations 2016-03-18 15:52:49 +01:00
jsteemann 906418778c cppcheck 2016-03-18 11:23:38 +01:00
Kaveh Vahedipour d6db18d655 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-18 10:45:15 +01:00
Max Neunhoeffer d1c5c64d6b Fix baby methods for documents in arangosh. 2016-03-18 02:05:19 +01:00
Max Neunhoeffer 37bac8881d Implement babies variant of DELETE /_api/document/<collection>. 2016-03-17 20:28:40 +01:00
Max Neunhoeffer 827f2f4f44 Improve /_api/simple/remove-by-key.
Fix more document methods.
2016-03-17 18:49:52 +01:00
jsteemann 81ca88381f bugfixes 2016-03-17 15:20:13 +01:00
jsteemann 171488b6d2 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 23:34:29 +01:00
Max Neunhoeffer d18c7cb625 Fix precondition failed babies case in RestDocumentHandler. 2016-03-16 19:54:59 +01:00
Andreas Streichardt 614beefc74 Throw Http error 503 when a required backend is unavailable 2016-03-16 18:04:05 +00:00
jsteemann 6d00c2d9e9 simplified 2016-03-15 12:37:40 +01:00
jsteemann fb50c5c0bb removed wrong location header 2016-03-15 10:59:28 +01:00
jsteemann 3fd954fc6a micro optimizations 2016-03-15 10:40:37 +01:00
Max Neunhoeffer f1e0e66c20 Reorganise insert. 2016-03-14 12:13:05 +01:00
Max Neunhoeffer 627ef39b81 Finish returnNew and returnOld for RestDocumentHandler. 2016-03-11 23:16:45 +01:00
Max Neunhoeffer 01f942239e Fix Rest handler. 2016-03-11 21:50:35 +01:00
Max Neunhoeffer 1cf6299399 RestDocumentHandler returnNew and returnOld. 2016-03-11 21:45:47 +01:00
Max Neunhoeffer e77159b008 New returnNew option for insert. 2016-03-11 12:44:36 +01:00
Max Neunhoeffer 06be35dd9b Fix RestDocumentHandler after recent changes to rev management. 2016-03-11 10:09:06 +01:00
Kaveh Vahedipour 9f51fe5fe9 merging from devel 2016-03-10 18:19:54 +01:00
Kaveh Vahedipour 61a55d61db Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-10 17:37:43 +01:00
Max Neunhoeffer 70772d6174 Remove RestEdgeHandler, start API-Changes-3.0.md Dokument. 2016-03-10 11:28:26 +01:00
Max Neunhoeffer d51beb5326 Get rid of update_policy for good. 2016-03-10 00:14:06 +01:00
Max Neunhoeffer 9074f99f09 Get rid of update policy in RestHandlers. 2016-03-10 00:02:47 +01:00
Max Neunhoeffer 80ee083105 Fix RestDocumentHandler: modify and remove. 2016-03-09 23:59:02 +01:00
Max Neunhoeffer c831858224 Fix RestDocumentHandler for POST. 2016-03-09 15:21:29 +01:00
Max Neunhoeffer 6b2fa8c33d RestDocumentHandler GET method, plus tests. 2016-03-09 13:28:13 +01:00
Kaveh Vahedipour 3d066d2f03 Store intestinals into cpp file. Write to db ok. 2016-03-09 12:29:01 +01:00
Kaveh Vahedipour 3a239fe1d5 Store intestinals into cpp file. Write to db ok. 2016-03-09 09:58:43 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
jsteemann d756f6a176 removed TRI_transaction_collection_t from public APIs 2016-03-09 01:51:17 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann 7c615858d0 removed unused cases 2016-03-08 17:35:19 +01:00
Michael Hackstein e60e7a3652 Aql/QueryResult now only uses VelocyPack instead of TRI_json_t. Also adapted all calling places 2016-03-08 13:08:05 +01:00
Michael Hackstein 4e7f5f8ab9 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-07 19:04:48 +01:00
Michael Hackstein 7c3690c4db AqlQuery now is contructed from VelocyPack builders only. Also variables and Execution Plan is constructed form VelocyPack only. 2016-03-07 19:04:37 +01:00
Kaveh Vahedipour df56885c09 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-07 17:38:38 +01:00
Kaveh Vahedipour 702a510f9e State::save, Store::apply, Store::read 2016-03-07 17:12:07 +01:00
Jan Steemann 5814cb024c adapted to new data structure 2016-03-07 17:07:57 +01:00
Jan Steemann b358fa329d fixed replication dump and logger-follow commands 2016-03-07 15:21:11 +01:00
Kaveh Vahedipour 8ba74610f9 State::save, Store::apply, Store::read 2016-03-07 11:15:53 +01:00
Max Neunhoeffer af3d61c339 Fix complation. 2016-03-07 09:04:58 +01:00
Max Neunhoeffer ab82405e9a Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-07 08:43:38 +01:00
Max Neunhoeffer 9358fcb96f Commit some fixes. 2016-03-07 08:40:54 +01:00
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
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 6eea757c01 simplifications 2016-03-04 19:40:24 +01:00
Jan Steemann 05f98cbd72 fixed compile errors 2016-03-04 18:43:51 +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
Kaveh Vahedipour ee11ff13f6 log & persist 2016-03-04 18:13:17 +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
Jan Steemann eb82d96836 constexpr 2016-03-04 12:33:59 +01:00
Max Neunhoeffer 2654e654db Compiles again, document API not yet sorted out. 2016-03-04 10:32:34 +01:00
jsteemann 0c580f1076 removed unused includes 2016-03-04 02:37:20 +01:00
Kaveh Vahedipour 9f71872116 notifyall 2016-03-03 18:50:19 +01:00
Jan Steemann 3cadcd5340 less json 2016-03-03 15:40:00 +01:00
Kaveh Vahedipour 2046a704e0 notifyall 2016-03-03 14:24:23 +01:00
Jan Steemann 78f07c6a31 less json 2016-03-03 14:23:39 +01:00
Kaveh Vahedipour 5f8a42fc8e builds with new store 2016-03-03 03:59:39 +01:00
Jan Steemann 06da362f93 some json removal 2016-03-02 17:51:05 +01:00
Jan Steemann ba40edac87 less json 2016-03-02 14:58:13 +01:00
Jan Steemann 66ee7e600d less json 2016-03-02 11:58:28 +01:00
Jan Steemann e6e864cd7a removed unused functions 2016-03-02 10:53:59 +01:00
Kaveh Vahedipour fa66ba2ffc compiles again 2016-03-01 16:45:34 +01:00
Kaveh Vahedipour 316f0cabfa found typo in definition 2016-03-01 12:23:34 +01:00
Jan Steemann 102066b4ee removed methods 2016-03-01 11:50:16 +01:00
Jan Steemann 21e5e68ae5 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 11:14:55 +01:00
Jan Steemann 6c152649d4 added allKeys() method 2016-03-01 11:14:40 +01:00
Max Neunhoeffer ad97830d7f Add babies to insert document API (V8 & HTTP & Transaction). 2016-03-01 10:14:24 +01:00
Kaveh Vahedipour 4435236e91 property_map 2016-03-01 08:52:20 +01:00
Jan Steemann eae225f4c8 changed marker storage 2016-02-29 18:33:16 +01:00
Kaveh Vahedipour 56c7ade66d Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-02-29 18:27:24 +01:00
Jan Steemann d122ace96a Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-29 17:44:37 +01:00
Jan Steemann 2e5a41c8c8 order barriers while accessing edges 2016-02-29 16:27:24 +01:00