1
0
Fork 0
Commit Graph

5322 Commits

Author SHA1 Message Date
jsteemann 7640586bd9 added test case for duplicate collections 2017-03-06 13:07:04 +01:00
Michael Hackstein b26ea6c3bd Added a recovery test for duplicate-name creation. This was broken during Engine-API build. 2017-03-06 10:41:21 +01:00
Frank Celler ab49f6c1b4 fixed variables parsing in GraphQL 2017-03-05 23:31:38 +01:00
Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangosh/Import/ImportHelper.cpp
2017-03-04 02:08:27 +01:00
Simon Grätzer e94cb25c92 Editing documentation and moving test 2017-03-03 23:29:23 +01:00
jsteemann 573c346fa5 attempt to fix issues reported by @ewoutp 2017-03-03 14:47:21 +01:00
jsteemann 356020a3c6 try to make test more deterministic, by not relying on a wait time of 5 seconds 2017-03-03 12:35:12 +01:00
jsteemann d369c698b5 fixed issue #2346 2017-03-03 10:10:38 +01:00
jsteemann 7051f5d87a fixed --convert false in arangoimp 2017-03-02 15:05:06 +01:00
jsteemann 14d5898fc2 test for issue #2342 2017-03-02 13:53:17 +01:00
Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	3rdParty/V8/v8
#	arangod/Transaction/Methods.h
#	arangod/Utils/UserTransaction.h
#	arangod/V8Server/v8-collection.cpp
2017-03-01 14:52:35 +01:00
Alan Plum 705273bdab
Allow passing own graphql-sync module to Foxx 2017-02-28 14:47:17 +01:00
jsteemann ed3a230939 some final cleanup 2017-02-21 13:04:24 +01:00
jsteemann c0c9fa4b19 Merge branch 'devel' of https://github.com/arangodb/arangodb into plan-cache 2017-02-21 12:18:55 +01:00
jsteemann f5c8932744 initial version of query execution plan cache, still very rough 2017-02-21 11:58:38 +01:00
Kaveh Vahedipour e65e7c2d60 resilience tests fail at times 2017-02-21 11:05:10 +01:00
jsteemann 12f1a7af29 fixed issue #2315 2017-02-21 09:11:50 +01:00
Alan Plum 90c538b7a4
Not undefined
[skip ci]
2017-02-15 18:32:56 +01:00
baslr b21ef73aa4 arangoexport: tests use temp directory for output 2017-02-15 12:53:53 +01:00
Alan Plum 622b4fac4b
JWT uses seconds
Fixes #2249.
2017-02-14 19:20:41 +01:00
Alan Plum 7471f94fa7
Linting 2017-02-14 19:20:41 +01:00
Alan Plum 5a02a8983f
More cookie options
Fixes #2085.
2017-02-14 19:20:40 +01:00
Alan Plum 022ff11886
REALLY fix routing tests 2017-02-14 17:18:40 +01:00
Alan Plum 01f83c20a2
Really fix routing 2017-02-14 17:15:44 +01:00
Alan Plum d72be1cf74
Fix routing 2017-02-14 17:15:06 +01:00
Alan Plum 0f4b932717
Fix Foxx routing 2017-02-14 16:36:40 +01:00
Alan Plum 2eb8f30c7f
Spring cleaning
Also removed actions.rewriteRouting as it is not actually used anywhere.
2017-02-14 16:36:40 +01:00
baslr 4783792684 arangoexport: inital work on test 2017-02-13 12:04:57 +01:00
jsteemann 238070b477 fixed code of some examples 2017-02-13 08:21:28 +01:00
Andreas Streichardt 39436dac89 Finally remove lock methods 2017-02-10 19:47:31 +01:00
Andreas Streichardt 488b71cf54 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-10 19:40:51 +01:00
Andreas Streichardt bc1df86ddd remove lock queries 2017-02-10 19:34:29 +01:00
Simon Grätzer edab268572 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/Aql/FunctionDefinitions.cpp
#	arangod/Aql/Functions.h
#	arangod/Utils/ExplicitTransaction.h
2017-02-10 15:21:24 +01:00
jsteemann dcd218c577 fix typo 2017-02-10 10:53:13 +01:00
Max Neunhoeffer cf2a47e52c Increase timeout for testServerEmpty.
Under heavy load 5 min might not be enough.
2017-02-09 22:14:53 +01:00
Max Neunhoeffer f72af6a06a Increase timeout for waiting for sync repl to settle.
This is mainly for the case of the parallel unittests, where the heavy
load leads to delays.
2017-02-09 22:06:39 +01:00
Michael Hackstein a3c916902a Merge branch 'engine-api' of github.com:arangodb/arangodb into devel 2017-02-08 16:43:15 +01:00
Andreas Streichardt 4a2bb9716a Do not start up if replication failed 2017-02-08 16:18:41 +01:00
Michael Hackstein 6ad225370a Removed usage of FULLTEXT in tests. Is replaced by simplequery fulltext() 2017-02-08 13:43:03 +01:00
Michael Hackstein 7cec7a4628 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-08 12:54:26 +01:00
Michael Hackstein d47298d518 Removed JS_NEAR, JS_FULLTEXT, JS_WITHIN entirely. They have been replaced by simple queries 2017-02-08 12:54:10 +01:00
Simon Grätzer 9b9f91a81c Pegel: Adding support for "PREGEL_RESULT" in aql 2017-02-07 18:37:23 +01:00
jsteemann 073b53b20f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 14:50:46 +01:00
Wilfried Goesgens 0932d51904 Merge branch 'devel' of github.com:arangodb/ArangoDB into v8_subsubmodule 2017-02-07 13:48:57 +01:00
jsteemann d468fffdcb fix problems with rollback 2017-02-07 13:04:27 +01:00
jsteemann c8df58dcc6 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-06 23:35:12 +01:00
Wilfried Goesgens 702db6a843 fix call to concat 2017-02-06 18:05:23 +01:00
jsteemann ab11410911 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-06 13:05:11 +01:00
jsteemann 31bb843f29 added test for sorting 2017-02-06 12:24:45 +01:00
Max Neunhoeffer ed0d5be0a6 If initial database is gone, use system database. 2017-02-06 09:47:19 +01:00
Max Neunhoeffer 20e2128a44 Fix shardDistribution in case of leader change. 2017-02-06 09:45:00 +01:00
Michael Hackstein 63f0e52e49 Fixed a bug in primaryindex. In some cases it reported that it could not find more documents although there were more. 2017-02-03 16:15:41 +01:00
jsteemann 06a0449790 fix jslint 2017-02-03 14:59:04 +01:00
Jan Christoph Uhde 1bd37e9867 add tests for geoindex 2017-02-03 13:51:41 +01:00
Max Neunhoeffer 72fa45cc94 Port better reporting of longish Schmutz behaviour to devel. 2017-02-03 10:47:13 +01:00
Max Neunhoeffer 7c0575b27d Fix timeout in cluster operation and wal flush bugs. 2017-02-03 10:42:06 +01:00
Frank Celler 415392af31 moved to debug log level 2017-02-02 16:00:48 +01:00
jsteemann 7556386202 fixed tests 2017-02-02 08:39:50 +01:00
jsteemann e256b11807 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-01 16:44:56 +01:00
jsteemann 0156c5aec7 make database deletion more deterministic 2017-02-01 16:44:41 +01:00
Max Neunhoeffer 105389702a Lower log level of sync replication events. 2017-02-01 16:04:04 +01:00
Wilfried Goesgens bb80b5cf90 Merge branch 'devel' of github.com:arangodb/ArangoDB into v8_subsubmodule 2017-01-31 16:34:42 +01:00
Michael Hackstein 0fc2558d2f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-31 16:09:10 +01:00
Michael Hackstein 51865c31c6 Fixed JSLint and added further tests for traverser optimizations (both sides containing output) 2017-01-31 16:09:00 +01:00
jsteemann 62145baa2a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-31 15:54:39 +01:00
Michael Hackstein e98c7d3b7c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-31 15:31:25 +01:00
Michael Hackstein ef8ca78dfb Added more tests for traversal optimization. Fixed an crash-error when optimizing . 2017-01-31 15:30:59 +01:00
jsteemann fc5d7311b5 use general BlockCollector in all cases in which it is appropriate 2017-01-31 15:03:24 +01:00
Max Neunhoeffer 5e1bf32276 Write bootstrap messages only in von V8 context. 2017-01-31 14:39:22 +01:00
Jan Christoph Uhde 4981af31c8 Merge branch 'devel' of github.com:arangodb/arangodb into devel
* 'devel' of github.com:arangodb/arangodb:
  lowering log output in agencycomm
  Lower log level for local shard operations to debug.
2017-01-31 10:08:03 +01:00
Jan Christoph Uhde 3b2f0bac6a remove "junk" from test code 2017-01-31 10:06:36 +01:00
Kaveh Vahedipour b7b8a6cf88 lowering log output in agencycomm 2017-01-31 09:37:47 +01:00
Max Neunhoeffer a5b4eb3c3d Lower log level for local shard operations to debug. 2017-01-31 09:31:52 +01:00
jsteemann 2c431ea9f1 documentation for ternary operator shortcut 2017-01-30 17:27:50 +01:00
Wilfried Goesgens 584f3120dd Upgrade V8
- ICU now doesn't build the icudata library anymore
    - ship the icu database on all platforms and all packages
    - we now load the icu database file ourselves, and hand over the pointer to ICU.
  - follow the V8 changes around Weak pointer handling
2017-01-30 12:30:07 +01:00
jsteemann 2fef24a984 added test 2017-01-30 09:02:30 +01:00
Max Neunhoeffer f09ecd21b2 Logging level for background job debugging down to DEBUG. 2017-01-29 23:05:33 +01:00
Max Neunhoeffer 6993ca32c7 Add more debugging output on log level info around Schmutz script. 2017-01-28 20:28:58 +01:00
Michael Hackstein 6aeb23ef2a Added new traversal optimizer test. 2017-01-27 19:52:43 +01:00
Michael Hackstein d5d316b971 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-27 09:58:02 +01:00
Alan Plum cbb77cf591
Only show codeFrames for swagger errors in dev mode 2017-01-27 02:03:51 +01:00
Alan Plum 3370ecbadd
Nicer error page and code frames 2017-01-27 01:57:30 +01:00
Alan Plum c268b2db91
Keep stacktraces out of error messages
They are already reported much more consistently via 'cause' so methods logging them should exploit that instead.
2017-01-27 01:57:29 +01:00
Kaveh Vahedipour 5faef0bc9e resilienceMove will do more reporting in cleanouts 2017-01-26 15:30:27 +01:00
Kaveh Vahedipour 0ea23a2b28 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-26 14:44:45 +01:00
Kaveh Vahedipour 1eef4c7b43 resilienceMove will do more reporting in cleanouts 2017-01-26 14:44:39 +01:00
Andreas Streichardt 2476cf7146 Fix drop and add reporting in agency current 2017-01-26 14:00:56 +01:00
Kaveh Vahedipour 30baf07652 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-26 12:38:09 +01:00
Kaveh Vahedipour f06fdf9e0f getDBServers response changed for aardvark frontend. needed reflection in resilienceMove tests 2017-01-26 12:37:59 +01:00
Andreas Streichardt 0365b3eb49 Fix index error reporting and add test for it 2017-01-26 12:15:42 +01:00
Michael Hackstein 75a152038e Updated optimize traversals rule test to use mocha instead of jsunity. 2017-01-26 11:15:09 +01:00
Max Neunhoeffer 1468628e58 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-01-26 10:47:26 +01:00
Max Neunhoeffer fe1b10e6af Fix waitForSyncRepl. 2017-01-26 10:47:03 +01:00
Andreas Streichardt 4e6371630a Fix reporting index and collection errors 2017-01-26 10:44:15 +01:00
Andreas Streichardt cffc981cf9 Fix jslint 2017-01-25 12:42:30 +01:00
Andreas Streichardt cca8fbc6b3 Less log spam... 2017-01-25 12:41:30 +01:00
Andreas Streichardt af8331119b Do not spam useless log messages 2017-01-25 12:31:53 +01:00
Max Neunhoeffer f913b10d22 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-01-25 11:37:37 +01:00
Max Neunhoeffer aaa2738b57 Log level for dropping local shard back to debug. 2017-01-25 11:36:50 +01:00
Andreas Streichardt acbb892612 Classic...fix unittest..fail real system 2017-01-24 19:07:34 +01:00
Andreas Streichardt d91a6af1a7 Remove singletransaction and fetch collection from vocbase directly 2017-01-24 18:51:05 +01:00
Andreas Streichardt d3642f1487 First update current tests 2017-01-24 18:35:26 +01:00
Andreas Streichardt ea220a22cc Make updatecurrentcollection better testable 2017-01-24 16:51:12 +01:00
Max Neunhoeffer 5e6d2c2045 Fix acquire of read locks for sync. replication. 2017-01-24 13:55:56 +01:00
Max Neunhoeffer 539ae7275e Improve formatting. 2017-01-24 13:29:05 +01:00
Kaveh Vahedipour 95a165d5f4 inquiring about 503 and 0 2017-01-23 16:35:50 +01:00
Andreas Streichardt 40af2963f4 Tackle updateCurrentDatabases 2017-01-23 15:29:25 +01:00
Andreas Streichardt b56621a01b First current tests 2017-01-23 15:29:25 +01:00
Michael Hackstein bf296c3d24 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-23 11:42:21 +01:00
Michael Hackstein 4beec0a94c Reverted numberOfShards from Test. The test-code is not deterministic. 2017-01-23 11:42:06 +01:00
Kaveh Vahedipour 981e71953d handling agency comm failures 2017-01-23 11:26:03 +01:00
Michael Hackstein 3eaf53c0c9 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-23 10:01:23 +01:00
Michael Hackstein 36e398f3f4 Fixed a bug with sort optimization in indexes. Also adapted tests. 2017-01-23 09:45:22 +01:00
jsteemann 35b55fec22 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 17:14:00 +01:00
Kaveh Vahedipour d2760f4ef1 pushing avoidServers property 2017-01-20 15:15:03 +01:00
Kaveh Vahedipour 3ae8428a05 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 14:56:53 +01:00
jsteemann 6941d45b8b removed prints 2017-01-20 13:13:57 +01:00
Andreas Streichardt 8fa235e715 oops 2017-01-20 12:10:16 +01:00
Andreas Streichardt b594257677 More tests 2017-01-20 12:03:12 +01:00
Andreas Streichardt 4afe4e431c more tests 2017-01-20 09:59:41 +01:00
Kaveh Vahedipour 648160c68a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 09:35:45 +01:00
Kaveh Vahedipour 40c6e2b48c unobserve should not create entries in agency, if empty before 2017-01-20 08:06:27 +01:00
Andreas Streichardt 33e30426b9 lint 2017-01-19 18:48:25 +01:00
Andreas Streichardt dec955826b Add sync tests 2017-01-19 18:40:09 +01:00
Andreas Streichardt 390cf295fe Fix lint 2017-01-19 17:29:05 +01:00
jsteemann 64d937475d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-19 17:14:46 +01:00
jsteemann 1b1dacd873 fixed issues with same revisions being inserted 2017-01-19 17:14:38 +01:00
Andreas Streichardt 5a101ed6f0 Fix unloading collections 2017-01-19 17:05:41 +01:00
Max Neunhoeffer 1e77d6abca Fix access to global ERRORS table. 2017-01-19 16:04:35 +01:00
Kaveh Vahedipour c32ffaf349 jslint needs informing of globalness of ERRORS 2017-01-19 15:17:19 +01:00
Max Neunhoeffer 4991056d61 Reactivate all shard move tests. 2017-01-19 14:21:35 +01:00
Max Neunhoeffer f9426e9e0d Make syncFinalize more resilient.
It is possible that an in-sync follower does not notice and tries
again to get in sync. This should be OK now.
2017-01-19 14:20:20 +01:00
Max Neunhoeffer 370cb09d89 Merge branch 'devel' into schmutz-ng 2017-01-19 10:32:43 +01:00
Andreas Streichardt 9bcaf08753 Merge branch 'schmutz-ng' of github.com:arangodb/arangodb into schmutz-ng 2017-01-18 18:07:24 +01:00
Andreas Streichardt a9ccdf86c1 Several movement fixes 2017-01-18 17:48:01 +01:00
Kaveh Vahedipour f47b3b3c9d transient heartbeats 2017-01-18 17:26:45 +01:00
Kaveh Vahedipour aaee2f9e61 transient heartbeats 2017-01-18 13:43:33 +01:00
Max Neunhoeffer c5cfc500ee Improve comments in cluster.js. 2017-01-18 10:47:50 +01:00
Frank Celler d290b74d55 fixed typos 2017-01-17 12:40:17 +01:00
Andreas Streichardt e90cc93e4a resign "a bit more" 2017-01-16 18:14:20 +01:00
Andreas Streichardt 744d51fb76 add current test work 2017-01-16 18:14:09 +01:00
Andreas Streichardt 7b13a56b91 Merge branch 'devel' into schmutz-ng 2017-01-16 16:15:09 +01:00
Kaveh Vahedipour 879102117d more replicationTest 2017-01-16 15:43:32 +01:00
Andreas Streichardt 10d3bd2200 Merge branch 'devel' into schmutz-ng 2017-01-16 15:22:17 +01:00
Andreas Streichardt 46b6c2659b Remove old schmutz 2017-01-16 15:20:09 +01:00
Andreas Streichardt f89b660056 Fix race during collection creation 2017-01-16 15:13:26 +01:00
Kaveh Vahedipour d7b61f1bde agency tests follow new leader 2017-01-16 14:10:09 +01:00
Kaveh Vahedipour aad9d6d576 agency-test should not break during reelection 2017-01-16 13:05:47 +01:00
Kaveh Vahedipour a75b3624de resilience move ok again? 2017-01-16 12:09:21 +01:00
Kaveh Vahedipour 5bf3a1ee33 fixing move shards resilience test 2017-01-16 10:29:21 +01:00
Max Neunhoeffer f35e3a7aaf Merge branch 'devel' into schmutz-ng 2017-01-16 09:54:09 +01:00
Frank Celler 6c368d70eb in case some-one throw a string 2017-01-13 21:15:46 +01:00
Andreas Streichardt 2a2cbf808a Do not update in endless loop 2017-01-13 17:55:22 +01:00
Andreas Streichardt b0792f1de3 Propagate errors during index creation 2017-01-13 13:21:41 +01:00
Andreas Streichardt 19b22ea9bf Partly fix the index schmutz 2017-01-13 11:30:05 +01:00
jsteemann 7abf112d8c fixed cluster test 2017-01-13 09:52:06 +01:00
Andreas Streichardt 1dcbf0850a Implement sync replication 2017-01-12 18:21:37 +01:00
Max Neunhoeffer 7da0de6207 Merge branch 'schmutz-ng' of ssh://github.com/ArangoDB/ArangoDB into schmutz-ng 2017-01-12 16:34:22 +01:00
Max Neunhoeffer fe9116f7fb More Schmutz-NG.
Does not trigger sync repl yet.
2017-01-12 16:33:57 +01:00
jsteemann feb954ca45 issue #2256 2017-01-12 12:20:11 +01:00
Andreas Streichardt 97b49e79de Add cluster sync tests 2017-01-11 18:18:51 +01:00
Kaveh Vahedipour fe48bcb982 fixed for short names in frontend shard view 2017-01-11 16:31:19 +01:00
Kaveh Vahedipour 7b023bd66f move shard jobs fail early if the contracting goes south 2017-01-11 11:50:18 +01:00
jsteemann dec7e084e5 added diagnostic output 2017-01-11 08:25:17 +01:00
Max Neunhoeffer 062ec7ec1a Activate ng Schmutz for databases. 2017-01-10 23:36:46 +01:00
Kaveh Vahedipour f34796b432 move resilience should now be correct as a test 2017-01-10 17:30:09 +01:00
Max Neunhoeffer e9630b7aca First set of changes, not yet activated. 2017-01-10 16:54:51 +01:00
Kaveh Vahedipour edac0586ab move shard has always been a matter of luck as a test in the cleanoutserver part 2017-01-10 15:37:08 +01:00
Max Neunhoeffer f47329f3c0 Mock new structure. 2017-01-10 13:41:16 +01:00
Andreas Streichardt 95cc704741 Ahhh jslint 2017-01-09 17:42:13 +01:00
Andreas Streichardt b51aebd596 additional error checking 2017-01-09 17:37:06 +01:00
Kaveh Vahedipour 0875353a26 all ArangoAgency.set rewritten in cluster.js 2017-01-09 17:30:36 +01:00
jsteemann 75263042c8 added tests for dropping indexes 2017-01-09 15:56:36 +01:00
Kaveh Vahedipour 3b57e84865 missing semis 2017-01-09 14:56:53 +01:00
Kaveh Vahedipour 13076e9fc1 no locks left in cluster.js 2017-01-09 14:45:44 +01:00
Kaveh Vahedipour 1ff26054fa jslint needs satisfaction 2017-01-09 11:46:26 +01:00
Kaveh Vahedipour 49631284c7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-09 11:11:39 +01:00
Kaveh Vahedipour 853eb1849a oops 2017-01-09 11:11:28 +01:00
Wilfried Goesgens 6830fd57f8 remove comments 2017-01-09 10:57:42 +01:00
Kaveh Vahedipour 55985ed5de missing prototypes 2017-01-09 10:38:34 +01:00
Wilfried Goesgens 8f13b943f4 re-enable testcase for windows. 2017-01-09 10:11:01 +01:00
Andreas Streichardt 13e3e8e673 more agency request mockery 2017-01-06 17:57:11 +01:00
Andreas Streichardt 11eb78c056 jslint 2017-01-06 17:28:39 +01:00
Andreas Streichardt b447051677 remove console.logs 2017-01-06 17:24:39 +01:00
Andreas Streichardt 466f932701 First steps to low level replication debugging 2017-01-06 17:19:07 +01:00
Kaveh Vahedipour a0af781630 to lock or not to lock 2017-01-06 14:46:57 +01:00
Kaveh Vahedipour e87182d971 more verbose output on failure to create plan 2017-01-06 09:38:37 +01:00
Kaveh Vahedipour b0a5b31626 shortening moveShard 2017-01-05 15:31:23 +01:00
Kaveh Vahedipour ea4467e0d4 shortening resilienceFail 2017-01-05 12:21:27 +01:00
jsteemann 49ef83c608 attempt to fix hanging tests 2017-01-03 15:54:36 +01:00
jsteemann b8a64ccca2 attempt to fix hanging tests 2017-01-03 15:53:52 +01:00
jsteemann dff5c448e4 fixed jslint 2017-01-03 14:58:07 +01:00
Kaveh Vahedipour 9d5a5537ce remove deceased agents from AgencyComm 2017-01-02 17:12:00 +01:00
Kaveh Vahedipour a2ee40d4f3 restarting agents inform rest of their new endpoints 2017-01-02 15:58:38 +01:00
Kaveh Vahedipour 1e8f44dcd0 increase plan too? 2016-12-30 14:03:37 +01:00
Kaveh Vahedipour 55ffd4c55f collections and current version 2016-12-30 13:54:55 +01:00
Kaveh Vahedipour ccca0103c2 lock/write lock tests in shell_server not needed anymore 2016-12-30 11:59:43 +01:00
Kaveh Vahedipour 4928358e04 removing trace of agency locks part 1 2016-12-30 11:21:11 +01:00
Kaveh Vahedipour 572d294ec7 getting rid of locks in cluster.js 2016-12-29 17:44:03 +01:00
Kaveh Vahedipour b712640f42 getting rid of locks in cluster.js 2016-12-29 16:39:59 +01:00
Kaveh Vahedipour 6ec19a3136 getting rid of locks in cluster.js 2016-12-29 15:18:08 +01:00
Kaveh Vahedipour ff701ff57c getting rid of locks in cluster.js 2016-12-29 15:03:09 +01:00
Jan Christoph Uhde c364c3c1d6 fix jslint errors in geoindex test 2016-12-20 12:07:50 +01:00
Alan Plum 99ba80a542
Fix off-by-one in Foxx route 2016-12-20 01:43:14 +01:00
Jan Christoph Uhde 5234ac3621 Squashed commit of the following:
commit 3952bf2009
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 19 11:00:52 2016 +0100

    remove debug code

commit 004da0c614
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 19 10:52:42 2016 +0100

    only do not use geoindex in inner loop if we want to sort

commit 32e1c7eac4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 19 09:16:09 2016 +0100

    manually cloning fixes the issue

commit 75823fe879
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 16 15:19:10 2016 +0100

    another try to fix the plan

commit 2a404cfabe
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Dec 14 12:21:21 2016 +0100

    add dump of ExectionPlan.

    Index Node seems to be created!

commit 0f8b496c57
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Dec 14 10:46:24 2016 +0100

    add debugging info for geoindex

commit 3d17672feb
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 13 17:03:01 2016 +0100

    better tests

commit 615b85e5f5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 13 16:09:00 2016 +0100

    add tests - sort && filter and add check for IndexNodes

commit e5fcdb7386
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 13 15:53:44 2016 +0100

    partial rewrite - now we start at endnodes

    and work upward towards singleton node

commit 7d93fe0bdd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 13 11:48:40 2016 +0100

    add link to geo-index doc to sourcefile to clarify goals

commit aac38c8a00
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 13 11:42:49 2016 +0100

    move collection acccesspath check to identify section

    so we can compare nodes

commit b8cc674219
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 13 10:59:02 2016 +0100

    prepare to fix filter-sort

commit 783a9aff89
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 12 16:24:52 2016 +0100

    check if nodes are really sorted

commit 1d5e28d969
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 12 15:36:43 2016 +0100

    fix geo-index for cluster case

commit 634eeabc0b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 12 13:46:20 2016 +0100

    add cluster to .gitignore

commit ae33a790fb
Merge: 1acfd65 27099a1
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 12 13:31:54 2016 +0100

    Merge branch 'devel' into obi-geo-index

    * devel:
      Clarify the default value of req.body
      fix VS warning
      moveShard jobs running
      cppcheck
      cppcheck

commit 1acfd65467
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 12 13:30:38 2016 +0100

    work on geo-index in cluster

commit 32d0bdc846
Merge: b660672 ad4ba24
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 12 09:15:36 2016 +0100

    Merge branch 'devel' of github.com:arangodb/arangodb into obi-geo-index

    * 'devel' of github.com:arangodb/arangodb: (132 commits)
      try to fix travis build
      Generate unique Swagger operationIds
      Add support for Swagger tags
      Add swagger route to Foxx API
      Require at least one arg in route def
      ported velocypack compatibility fix from arangodb/velocypack
      use bulk allocator for index elements
      fix memleak
      fix test in cluster
      remove unused code
      fixed resilience
      Update zwagger
      Readd satellite node
      Fix link
      Document OAuth1
      Nicer OAuth2 docs
      properly start the tarball
      fix VS compile errors
      clones method in Jobs more useful
      we don't need the dpkg-shlibdeps workaround anymore.
      ...

commit b6606727ee
Author: jsteemann <jan@arangodb.com>
Date:   Thu Dec 8 11:13:10 2016 +0100

    fixes

commit 5416755049
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Dec 7 15:06:44 2016 +0100

    avoid use of geo-index-rule in cases where it could yield an invalid result

commit 3e24624c6e
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 6 15:56:22 2016 +0100

    back to performance

commit a941808ea8
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 6 10:29:38 2016 +0100

    remove debug code for performance testing

commit 2bae135b84
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 6 10:12:12 2016 +0100

    add test case

commit 71be8c215a
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Dec 6 10:00:11 2016 +0100

    node replacement is now working

commit d1a3e4482d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 20:18:31 2016 +0100

    condition replace should be almost working

commit 275e36b603
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 19:49:10 2016 +0100

    add pointer that needs to be replaced with true

    in sort or filter condition

commit 6b93b9d2eb
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 19:38:01 2016 +0100

    bring functions in correct order

commit 5aabbb0ac0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 16:21:21 2016 +0100

    fix const-ness so the condition can be modiefied

commit c84223d598
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 15:31:50 2016 +0100

    Add information if AstNode has been found in subexpression

    this information can be used in rewriting the condition and deciding
    if a sort node can be deleted or not

commit b0b660eb85
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 15:19:06 2016 +0100

    add iterative preorder walk for and conditions

commit 5dcf61c9ba
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 14:00:14 2016 +0100

    now work to a certain degree with binaray/naray-and in FILTER/SORT
    condition

commit 9b4e01eb3b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 13:17:01 2016 +0100

    move geoIndexRule to a positon before inexes have been touched by
    optimizer

commit 9d04b37e58
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Dec 5 12:46:23 2016 +0100

    within queries are now working

commit d858b9aa71
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 2 16:15:23 2016 +0100

    further implement within

commit 72d4790c68
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 2 12:22:07 2016 +0100

    remove boost::optional and make use of nodetype

commit e0220be12d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 2 11:53:31 2016 +0100

    stronger split between identification of candidates and application of geo index rule

commit f27a22db06
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 2 11:20:09 2016 +0100

    fix debug code

commit fab9af483e
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 2 11:00:39 2016 +0100

    add extra log topic for development

commit 56b6be851c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Dec 2 10:44:42 2016 +0100

    add functions providing capability to check ast for parts of geoindex
    rules

commit 08ef943c83
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Dec 1 23:01:50 2016 +0100

    fix tests

commit 56614ac8c8
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Dec 1 16:30:09 2016 +0100

    switch unittests to chai and add failing test for FILTER condition

commit 8bb719c615
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Dec 1 15:59:10 2016 +0100

    add first tests for geoindex

commit e619ef3e4e
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Dec 1 12:21:51 2016 +0100

    now inspect sort and filter nodes

commit 5dbf5e14e3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Dec 1 10:03:24 2016 +0100

    refactor geoOptimization into smaller fucntions

    this prepares the creation of the within rules

commit 2110736d36
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Nov 30 16:50:02 2016 +0100

    fix logical error in nextBabies

commit 972af3af4c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Nov 30 15:44:46 2016 +0100

    add within to geoindex iterator

commit 80c89d5f97
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Nov 30 15:25:11 2016 +0100

    geo condition is now build with a extra parameter for within

commit 8bafcdfe92
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Nov 30 14:10:16 2016 +0100

    GeoIndexIterator now takes parameters via ConditionNode

commit 86c21eb733
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Nov 29 14:13:35 2016 +0100

    make use of geo index cursor api

commit 5b3be69e10
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Nov 29 11:48:32 2016 +0100

    WIP first working version of geoindex via aql
2016-12-19 11:06:32 +01:00
Max Neunhoeffer a7f295bfe8 Fix error handling in resilienceMove test. 2016-12-16 11:02:13 +01:00
Kaveh Vahedipour 86a0620525 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-15 17:22:12 +01:00
Kaveh Vahedipour f66d3b1dac fixed moveshard tests 2016-12-15 17:22:01 +01:00
jsteemann 3939d5e2d8 don't log irrelevant message in generated Foxx apps 2016-12-15 16:18:07 +01:00
Kaveh Vahedipour 842d1030f0 Fixed dangling UUID problem in missing database directory 2016-12-13 15:36:19 +01:00
Alan Plum 3e93980ae9
Generate unique Swagger operationIds 2016-12-12 02:32:50 +01:00
Alan Plum 9a81d2cb63
Add support for Swagger tags 2016-12-12 02:32:50 +01:00
Alan Plum f2a6864db4
Require at least one arg in route def 2016-12-12 02:32:49 +01:00
Kaveh Vahedipour fe8301cd31 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-09 16:40:02 +01:00
Kaveh Vahedipour 2b9c018817 fixed resilience 2016-12-09 16:35:32 +01:00
Alan Plum d8bf7252e2
Document OAuth1 2016-12-09 15:28:36 +01:00
Andreas Streichardt 9fedba9fff Fix eslint 2016-12-08 10:14:50 +01:00
Andreas Streichardt 10f7d75651 Fix uniform shard distribution when creating collections 2016-12-07 18:38:15 +01:00
Jan Steemann 5911f14bba updated CHANGELOG 2016-12-07 13:23:09 +01:00
Alan Plum 0700cfa86a
Implement OAuth 1.0a 2016-12-06 18:30:11 +01:00
Andreas Streichardt 11bd9381d5 Add satellite collections 2016-12-06 16:40:50 +01:00
Michael Hackstein dd0dca8a8d This actually fixes the last commit... 2016-12-06 13:45:55 +01:00
Michael Hackstein 06e66754bb Fixed cluster version of Optimize non-edge index tests. It is deactivated now, the cluster decides differently on the indexes. 2016-12-06 13:33:23 +01:00
jsteemann 369b2c7bc6 added optional memory limit for AQL queries 2016-12-06 13:23:41 +01:00
jsteemann 2521dff57c fix error message returned by arangoimp in case of some secondary unique key constaint violations 2016-12-02 13:37:17 +01:00
Jan Steemann 8443d4317e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-29 10:59:45 +01:00
Jan Steemann 6754761273 fix index persistence 2016-11-29 10:59:38 +01:00
Michael Hackstein 4331af37f9 Added a test for Skiplists and traversals, if the condition cannot cover _from resp _to inside the index. 2016-11-29 10:27:08 +01:00
Frank Celler 7e46422cbf Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-28 17:32:57 +01:00
Frank Celler 4b1b6a2e7f Added test for Traverser using indexes not containing _from or _to 2016-11-28 17:32:04 +01:00
Michael Hackstein 0786eb735f Fixed passing of unique when using createHashIndex() 2016-11-25 16:08:58 +01:00
jsteemann c784c54799 fix failing test 2016-11-25 15:45:59 +01:00
jsteemann d09ac31051 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 11:18:56 +01:00
Michael Hackstein 37b124593f Unified ensureIndex on client and server libs. 2016-11-25 11:11:45 +01:00
jsteemann 817933c77b bugfixes for sync replication and collection status in cluster 2016-11-24 17:00:57 +01:00
Andreas Streichardt f81df6aa86 Add unittest for hashindex collision bug 2016-11-24 15:09:54 +01:00
Andreas Streichardt c4f5cb7474 debug logging 2016-11-24 13:27:58 +01:00
Alan Plum 4edb258ebb
Fix breaky multi-deps 2016-11-24 09:33:39 +01:00
Andreas Streichardt c1db7228c7 Coordinator will not always wait for system collection replication 2016-11-22 15:07:00 +01:00
Alan Plum a854cbf674
Fix Windows file path resolution 2016-11-22 14:02:01 +01:00
Jan Steemann 689c7fbdc3 fixed issue #2183 2016-11-21 13:41:49 +01:00
jsteemann 38e18a9e65 fix test 2016-11-21 08:45:37 +01:00
Alan Plum 2f07366b8f
Implement process.stdout.isTTY 2016-11-19 18:42:29 +01:00
Alan Plum d6a063e28d
Allow multi-dependencies in Foxx 2016-11-18 17:22:07 +01:00
Alan Plum 593274b095
Sanitize paths in fm.requireService 2016-11-18 17:22:07 +01:00
Alan Plum 5493420a81
Make deps immutable 2016-11-18 17:22:07 +01:00
Alan Plum e12ba2ad3b
Allow descriptions in Foxx dependencies 2016-11-18 15:13:25 +01:00
Alan Plum 2ed6d8cc3e
Discard unknown Foxx configs in production
Fixes #2162
2016-11-18 11:47:00 +01:00
Alan Plum a73ce31e7b
Change format of Foxx API listScripts route 2016-11-17 17:29:51 +01:00
Kaveh Vahedipour acb187851f Merge pull request #2153 from de3/devel
fix upgrade/install foxx in cluster environment
2016-11-17 15:34:35 +01:00
Alan Plum 57cd82f88c
Fix swagger static path resolution 2016-11-15 18:08:06 +01:00
Alan Plum 8f6f022616
Unescape parts during Foxx routing 2016-11-15 17:38:15 +01:00
Alan Plum facee370fa
Fix static file serving for paths wth dots in them 2016-11-15 15:41:33 +01:00
Jan Steemann 19f771fcd6 issue #2168 2016-11-14 17:30:19 +01:00
Alan Plum c0a3f5a8a1
Better Foxx API error handling 2016-11-12 22:33:07 +01:00
jsteemann ecaf2fd16b when querying edge index selectivity, pass attribute name (i.e. _from, _to) so the selectivity of the correct index part can be returned 2016-11-11 11:01:04 +01:00
Alan Plum 461cfdfcc2
Don't expose configuration in dev mode error page
Fixes #2156.
2016-11-08 16:41:10 +01:00
Jan Steemann 8504246217 changed behavior of toJSON() function when serializing an object before saving it in the database
if an object provides a toJSON() function, this function is still called for serializing it.
the change is that the result of toJSON() is not stringified anymore, but saved as is. previous
versions of ArangoDB called toJSON() and after that additionally stringified its result.
2016-11-08 15:39:06 +01:00
Edi 69ee438be3 fix upgrade/install foxx in cluster environment
When install/upgrade, arangodb response is "No such file or directory".
This is because serviveInfo path already join with temporary Path, and then
in "uploadToPeerCoordinators" it join twice with temporary path.
Another problem, arangodb upgrade url is "update" not "upgrade".
Last problem, when Sync foxx with another cluster, use "coordinatorTransactionID"
but there is no that key response from ArangoClusterComm.
2016-11-08 08:02:53 +07:00
Alan Plum ccb251e1f5
Better handling of routers & middleware in Swagger
Fixes #2148.
2016-11-04 20:06:08 +01:00
Alan Plum 735f0e5f6c
Resolve 'lib' for 3.x services
Fixes #2139.
2016-11-03 10:35:06 +01:00
jsteemann 68317bb4f2 added experimental `REGEX_REPLACE` AQL function 2016-11-03 00:40:19 +01:00
Alan Plum f630020269
Expose static req.reverse as module.context.reverse 2016-10-31 17:38:11 +01:00
Michael Hackstein 8f0a1f47f8 Fix for ShoretestPath in Cluster. Does only show up with > 1 shards. Adapterd tests to use 4 shards instead of 1. 2016-10-31 09:19:49 +01:00
jsteemann eb2ba21596 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-28 13:45:02 +02:00
jsteemann 5a4a8ede2a jslint 2016-10-28 13:44:11 +02:00
Andreas Streichardt f9204cf71c Remove useless debug output 2016-10-28 12:50:22 +02:00
Kaveh Vahedipour 5c38455fbd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-27 15:04:43 +02:00
Kaveh Vahedipour 985c0a4318 fixed sporadic failure of foxx apps to start 2016-10-27 15:04:26 +02:00
Alan Plum 33b6a2b8eb
Fix failing swagger test
Adds missing signature variant for endpoint.response method.
2016-10-26 21:06:19 +02:00
Alan Plum 0950520eb5
Implement inline middleware 2016-10-26 18:16:18 +02:00
Alan Plum a999dee906
Add scripts route to Foxx API 2016-10-26 11:41:08 +02:00
Jan Steemann 1e84dd9008 added test cases 2016-10-25 18:44:32 +02:00
Jan Steemann 8236ae2a05 added tests 2016-10-25 16:51:58 +02:00
Max Neunhoeffer c695d60a2d Merge branch 'devel' of https://github.com/ArangoDB/ArangoDB into devel 2016-10-21 09:13:01 +00:00
Max Neunhoeffer 6d96e51883 Catch an exception in wait for sync replication. 2016-10-21 06:45:48 +00:00
Max Neunhoeffer 638ce07e6d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-10-20 15:10:38 +02:00
Max Neunhoeffer 01a386cdc1 Correct some comments. 2016-10-20 15:10:22 +02:00
Alan Plum 245819ea9c
Add Foxx HTTP API 2016-10-20 15:09:36 +02:00
Alan Plum 6aaa55f9dc
app -> service 2016-10-20 15:08:18 +02:00
Frank Celler 0883c49cd2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-20 13:15:07 +02:00
Frank Celler 7ab630fabc Removed cluster special case for xxxByExample. 2016-10-20 13:11:24 +02:00
jsteemann 5730d0bdc4 fixed jslint 2016-10-20 11:34:18 +02:00
Michael Hackstein 4fac851560 Added some better handling of SmartEdgeCollections in simpleQueries. 2016-10-19 15:19:33 +02:00
Jan Steemann 3c96c6f428 fix jslint 2016-10-18 13:55:10 +02:00
Jan Steemann 47382b20d7 issue #2115 2016-10-18 13:54:33 +02:00
Andreas Streichardt 4ad6ddef3b Fix naming 2016-10-17 14:00:58 +02:00
Michael Hackstein 1243dc503d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-17 13:58:31 +02:00
Michael Hackstein 7f3b67170a Removed obsolete JS Coordinator truncate() implementation. All done in cxx now. 2016-10-17 13:58:14 +02:00
Andreas Streichardt ad2327022e Merge remote-tracking branch 'origin/devel' into authentication 2016-10-17 13:51:26 +02:00
Andreas Streichardt 1318fa313b Implement cluster authentication 2016-10-17 13:35:55 +02:00
Max Neunhoeffer c9cf9a60c8 Put some debug messages in log level debug. 2016-10-14 18:48:11 +02:00
Jan Christoph Uhde f1c3c89d77 Merge branch 'devel' of github.com:arangodb/arangodb into devel
* 'devel' of github.com:arangodb/arangodb:
  Fix #2110
  allow users to get information about themselves
  added a newline before generated text
  More logging in AgencyComm.
2016-10-14 10:13:02 +00:00
Jan Christoph Uhde 620b0e6777 switch to boost asio
Squashed commit of the following:

commit 946c37a9247fc2c5bafb91d8ffd8d62096376214
Merge: 6b1957c 52877d3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 14:03:31 2016 +0000

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'devel' of github.com:arangodb/arangodb:
      More logging of _role and _leaderID changes in agency.
      queryView #2111
      Better logging of redirects.
      Automate mac build - DRY for prefixes, directories etc. - possibility to provide build.sh with the prefix
      try to locate brew installations of openssl
      More logging in redirect case in AgencyComm.
      css
      ui query profiling
      Added Documentation for SmartGraphs via HTTP.
      return meaningful error message
      grunt build
      queryview bugfix
      typo
      fixed collection create bug
      typo
      Fixed JS syntax bug in gharial module
      added shards keys to coll. info view

    Conflicts:
    	Installation/Jenkins/build.sh

commit 6b1957c84276792c3ee32ec97ab5e943910498ec
Merge: 7235be0 79c0f54
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 11:28:33 2016 +0000

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'devel' of github.com:arangodb/arangodb:
      Add more logging about shard creation/dropping/cleaning.

commit 7235be03b8152227e7b315045d90d9b995cd3036
Merge: ddbd020 c576426
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 11:02:51 2016 +0000

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'devel' of github.com:arangodb/arangodb:
      Increase some timeouts from 60 to 90s to be more load tolerant.

commit ddbd0209ddbf0a2ed535c385ed0787533ed6c284
Merge: a5bf367 f949b49
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 10:17:36 2016 +0000

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'devel' of github.com:arangodb/arangodb:
      Fix a typo.
      left-align table headers in query result view
      Work on the macos Bundle scripts

commit a5bf367b72f2679aa8ba83a2cd509028b6b6e924
Merge: 56aef8f a5e51e5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 10:17:12 2016 +0000

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'devel' of github.com:arangodb/arangodb: (30 commits)
      Further fixes in gharial for SmartGraph support.
      Increase timeout to test ttl.
      fix typo
      Fix AQL REPLACE for smart edges.
      semistandard
      Fix performRequests?
      Adjust comments about TRI_usleep and usleep.
      fixed compile warning
      queryview bugfix, color
      added missing legend and color
      "ressources" => "resources"
      add state "loading collections" to query profile results
      colors, gv
      query view, images
      performance optimization
      As we wait for arangodb to be up and running, we should also wait for its shutdown on deinstall.
      f*in with nsis
      fix one more typo
      Fix syntax error
      Work around more cmake / cpack / nsis vodoo
      ...

    Conflicts:
    	arangod/Cluster/ClusterComm.cpp
    	arangod/RestHandler/RestReplicationHandler.h

commit 56aef8f6a8d6106dd717ecde1cd37a6a87cc7fa4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 12 14:28:33 2016 +0000

    add missing function to RestDemoHandler.h

commit 819995d0a65fe5450f655e572086e4b4999b9e48
Merge: 0561bc8 300066f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 12 16:07:26 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'devel' of github.com:arangodb/arangodb: (34 commits)
      More logging in case of strange timeouts.
      Different agents log in different files.
      Fix windows config paths for the PKGDATADIR
      Fix windows compile
      Remove debugging
      Another place we need the binaryPath for windows
      cppcheck
      Fix windows compile
      fix compile warning
      Added a new isEnterprise function in js internal module. Started to make gharial aware of SmartGraphs
      More places to pass along the binaryPath for teh windows
      fixed issue '"WARNING DefaultCustomTypeHandler called" on read'
      its nullptr on windows too.
      Protect memory accesses to _snapshot in Supervision.
      We also need to know the binary directory when looking up the config file; else we may miscalculate file locations.
      disable optimizations for package builds to least common denominator.
      - Fix enterprise package naming for windows & mac - add missing `make package` target for mac
      Fix a bug in RemoveBlock.
      Add support for AQL REMOVE for smart edge collections.
      Fix paths
      ...

commit 0561bc82374cb8ee61d8b5587ef10895a1bfe580
Merge: 302b5f2 682ec09
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 12 09:17:14 2016 +0200

    Merge branch 'boost_asio_mops_schleife' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'boost_asio_mops_schleife' of github.com:arangodb/arangodb:
      dont re-send request in case of connection timeout
      fix segfault when connection is gone

commit 302b5f2a1311b0537246d3ca767edf213e27cff2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 12 09:15:55 2016 +0200

    add - extra log message for timeout)

commit 682ec09985f4c10f95022be3c11b5f5587793f57
Merge: 0251d33 2760ea0
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 10:55:49 2016 +0200

    Merge branch 'boost_asio_mops_schleife' of https://github.com/arangodb/arangodb into boost_asio_mops_schleife

commit 0251d33da34b43758d71be98f675404c531b4def
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 10:55:36 2016 +0200

    dont re-send request in case of connection timeout

commit ca6565d9e20eaffb7786c6e13283640ed070b749
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 10:55:21 2016 +0200

    fix segfault when connection is gone

commit 2760ea03923e4a870c2b48fbfd40d6107faeb069
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 11 09:37:42 2016 +0200

    cancel keep alive timeout when calling handler

commit 0f0add4cf2da57464f3b7dbcbfc8db864b735bfb
Merge: 250dd05 0bfe447
Author: Frank Celler <frank@arangodb.com>
Date:   Mon Oct 10 17:17:24 2016 +0200

    Merge remote-tracking branch 'origin' into boost_asio_mops_schleife

commit 250dd051114c120bcbc1dcaf2a7d10da609d9cf2
Merge: 5dd1e85 5a59619
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 11:47:05 2016 +0000

    Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'curl-communicator' of github.com:arangodb/arangodb:

commit 5dd1e85b699616fc5585c53d4cdaca6cdef76401
Merge: 58cf544 04c49f6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 13:46:18 2016 +0200

    Merge branch 'boost_asio_mops_schleife' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'boost_asio_mops_schleife' of github.com:arangodb/arangodb:
      fix curls CMake

commit 5a59619599fc5c7d442af65906a00770602d953d
Merge: 1103c97 60f7d9d
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 13:42:52 2016 +0200

    Merge remote-tracking branch 'origin/devel' into curl-communicator

commit 58cf544f99c51232a8dc5ed2664be4001068eceb
Merge: 6563b98 60f7d9d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 13:40:38 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'devel' of github.com:arangodb/arangodb: (35 commits)
      Fix dump/restore tests.
      Add a sensible default.
      MSC_VER is an integer
      fix compilation on windows broken by 4e8fc9b665
      overview documentation of agency
      overview documentation of agency
      fixed license path
      Added agency HTTP API
      switch to bold
      Update Version.cpp
      extend the compiler type with compiler-version
      creating snap package (with -DUSE_SNAPCRAFT=ON)
      Create snap.cmake
      Create snapcraft.yaml.in
      Link jemalloc staticaly.
      overview documentation of agency
      Revert "Fix return value of local edge write to smart edge collection in AQL."
      Fix return value of local edge write to smart edge collection in AQL.
      Fix writing of edges in AQL to smart edge collections.
      Changes necessary for AQL INSERT for smart edge collections.
      ...

commit 6563b98850722c1ed45db7737576ca7e73b9a437
Merge: f0b59f1 1103c97
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 13:05:24 2016 +0200

    Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'curl-communicator' of github.com:arangodb/arangodb:
      Add proper cleanup
      clang format
      Do threaded resolving in curl...because otherwise we will have timeouts (klingt komisch, is aber so)
      error buffer
      bool fail
      Add errordetails
      Boolfail :S

    Conflicts:
    	arangod/Agency/Agent.cpp
    	arangod/Cluster/ClusterInfo.cpp
    	lib/SimpleHttpClient/Communicator.cpp
    	lib/SimpleHttpClient/Communicator.h

commit 1103c97b8ad3a398ee1df53cd2226ee45d4a4c73
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 12:53:01 2016 +0200

    Add proper cleanup

commit 9fdc5858bc32e2d7a34271e8ee08c4e931127451
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 12:51:52 2016 +0200

    clang format

commit 19769f13bb6faad02a23a5750f9fb295d47fb847
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 12:00:45 2016 +0200

    Do threaded resolving in curl...because otherwise we will have timeouts
    (klingt komisch, is aber so)

commit 04c49f64240fcbec1b44143f295c8c4fdcb03b54
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 09:21:05 2016 +0000

    fix curls CMake

commit 715f41f172406dacafa809e5ca1c075c10fab7cf
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 10:52:38 2016 +0200

    error buffer

commit 0fd78ec9d1789000959b0770afc384bd5f740c13
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 10:41:55 2016 +0200

    bool fail

commit 7d71bd590c101f9d1161eacfed24053bada5c3bc
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 10:32:54 2016 +0200

    Add errordetails

commit 25bab33fb50edbd2a159e601e9e4ceddf3ff3fee
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Fri Oct 7 18:30:25 2016 +0200

    Boolfail :S

commit f0b59f1ff2e374e54e50af14c2ab129d6b053a19
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Oct 7 11:43:32 2016 +0000

    release strand at the end

commit b3512b4d5a0284e5907a51656666b5e0482d3298
Merge: 7bbe0c6 d08fe7f
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Fri Oct 7 16:08:17 2016 +0200

    Merge branch 'devel' into curl-communicator

commit f1ee42104c4a3b46e69c1a66c5c3290f1c0b13b7
Merge: 7a79485 7bbe0c6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Oct 7 13:57:05 2016 +0000

    Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'curl-communicator' of github.com:arangodb/arangodb:
      fixed windows compile errors

commit 7a794855d7174414514a7003d53e68f0e9e0dc6e
Merge: 2917f1b d08fe7f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Oct 7 13:56:43 2016 +0000

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'devel' of github.com:arangodb/arangodb:
      add option to disable processor specific optimisations
      fix AQL tests in cluster
      don't write undefined into the errors file if no GDB output is there
      Modified the internal constructor of general graph to use a single json object instead of several input parameters.
      Improve collection handling in AQL (still far from good).
      Modernized general-graph module. It now uses ES6 class syntax.
      Testing.js now starts in enterprise mode if possible.

commit 2917f1b49f8d8b50046ac5c00ce51fe158d7e121
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Oct 7 12:51:22 2016 +0000

    fix asio shutdown

commit b472335448ba0ac1c00e270d498506c49272add1
Merge: a6e4d12 ecc3b56
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Oct 7 14:10:30 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife

commit a6e4d128d05ee03df7510509467cba3f81dda89e
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Oct 7 10:42:27 2016 +0000

    added clearHandlers

commit 7bbe0c68b64fcc81ec17474f67bc4cafe4c61e50
Author: Mark <mark@arangodb.com>
Date:   Fri Oct 7 10:47:43 2016 +0200

    fixed windows compile errors

commit 4f41c5dffa2191ddcd677aa774c36de3d7d9dde3
Author: Wilfried Goesgens <willi@arangodb.com>
Date:   Thu Oct 6 18:19:16 2016 +0200

    output exit signal

commit 8152513d152c5d7912d9f62e423bb1a0075bad64
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Oct 6 15:22:32 2016 +0000

    added clearHandlers

commit 5ce884b3c3abcae562dd26df97a99b30d9745b7c
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Oct 6 14:26:24 2016 +0000

    added reset for asio handler

commit 4be942d98c8ff6a051344ad01685682e985d2210
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Oct 6 15:55:53 2016 +0200

    added reset

commit 2d18a0175cef55b9f41097a5a31b1ec85574f2fe
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Oct 6 15:55:19 2016 +0200

    removed warning

commit 0d6e033dd83938fff6c3013c9e965cfb58d53722
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 6 10:11:34 2016 +0200

    fix typo

commit 02a7726fbcd012a22c62a8bee09f4dfa96583bc3
Merge: f9a2ae5 794b0e0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 6 09:57:17 2016 +0200

    Merge branch 'boost_asio_mops_schleife' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'boost_asio_mops_schleife' of github.com:arangodb/arangodb:
      need to call cancel before erase

commit f9a2ae5fa17517089b5ca4f2d37d92a73243dbbf
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 6 09:54:55 2016 +0200

    try to fix shutdown by consuming all work by calling run_one in a loop

commit 94b679a3a0f2daa1fe4588809356672e2035fed2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 5 07:50:39 2016 +0200

    fix leak

commit 794b0e00d5b66d8d57486b007f666b5ee5027648
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Oct 4 16:06:26 2016 +0200

    need to call cancel before erase

commit c7a3107d69aed7052b3cea42b4b8deed37ac19e2
Merge: c5b3840 21298c3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 15:49:53 2016 +0200

    Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'curl-communicator' of github.com:arangodb/arangodb:
      Revert "making it build partly out of source"

commit c5b3840b23a7e0ed77b53f333cba964c8cdc7a5d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 15:24:19 2016 +0200

    add call to curl multi cleanup

commit e57aad9cfab3466bba69f1fce9dd567a57b5cdbd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 15:14:51 2016 +0200

    fix call curl global cleanup

commit f80f50a809dfef03079393c4472fce863e0524a0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 14:10:48 2016 +0200

    add suppressins file for asan

commit 21298c36026d0d63282a2c17b37b082f4bab7101
Author: U-WIN-O80T0OH79D8\jenkins <jan@uhdejc.com>
Date:   Tue Oct 4 12:33:10 2016 +0200

    Revert "making it build partly out of source"

    This reverts commit 82eea7a19e722ae5d89efb38140aaadcbd53d398.

commit f3b21b211df92a0d96d1476b74333d41a9060c7d
Merge: 3a5993d 595fc9b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 12:09:17 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'devel' of github.com:arangodb/arangodb: (27 commits)
      moveShard with distributeShardsLike
      moveShard with distributeShardsLike
      moveShard with distributeShardsLike
      linux fixes
      more authentication events, fixed changePassword
      arangodb::aql::Collection::shardIds for smart edge colls.
      Fix a typo.
      Edge indexes have now ID 1.
      grunt build
      fixed typo
      gv fixes
      grunt build
      ui - move aql result into graph viewer
      added different path for different editions
      Do not wait for synchronous replication to settle when creating a database.
      distributeShardsLike now stores CID
      Fix error handling for ClusterInfo::getCollection.
      distributeShardsLike now stores CID
      Fix enterprise version for non-smart and single server graph traversals.
      shards view [ci skip]
      ...

    Conflicts:
    	arangod/RestHandler/RestAuthHandler.h
    	arangod/RestServer/arangod.cpp

commit 3a5993d9e94cdfc635b038df923984d1802e7383
Merge: df57ad9 3ac64be
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 11:44:46 2016 +0200

    Merge remote-tracking branch 'origin/curl-communicator' into boost_asio_mops_schleife

    * origin/curl-communicator:
      Add CURL_STATICLIB globally
      Finally set variables correctly
      Disable tests
      Remove debug
      Do not use MS scale timeout
      Add curl build dir
      Fix include path for curl..no idea why there is no CURL_INCLUDE_DIRS style variable...
      curl static against openssl
      Add curl
      making it build partly out of source
      Curl on windows
      Make the crc message status (so it doesn't pop up as red in the cmake ui)

commit df57ad959b79da789ead2058fe8440e97cd09d74
Merge: b3653e9 b4e5123
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 11:22:45 2016 +0200

    Merge branch 'boost_asio' into boost_asio_mops_schleife

    * boost_asio:
      replace our ssl init calls with boost::asio::ssl calls
      fix ssl in cluster

commit b4e5123798e62954c683af073b4db3191a395a61
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 11:07:40 2016 +0200

    replace our ssl init calls with boost::asio::ssl calls

commit 3ac64be8a4b0e95162401b87b3cac903897be082
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Tue Oct 4 10:22:06 2016 +0200

    Add CURL_STATICLIB globally

commit e93940cb0c1905d8157070adc8cce13c0b11bd5c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 09:51:44 2016 +0200

    fix ssl in cluster

commit 833722cdd151edac81b4834a0b838961b87aca99
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 18:44:24 2016 +0200

    Finally set variables correctly

commit 663822cc23cee0001eb7faf5419719eac77849da
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 18:02:17 2016 +0200

    Disable tests

commit c0d7a9a73fcf9f42de7c13b87af02d7db326d586
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 17:12:55 2016 +0200

    Remove debug

commit 28367243f8c3b79fcf99f16017e9360b2e2f9ac9
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 17:12:09 2016 +0200

    Do not use MS scale timeout

commit ceaa2682baf3bb0a028cdb5211a0c334d5db23b3
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 16:39:04 2016 +0200

    Add curl build dir

commit b3653e93a890745b32db11f45506b723d67fc99d
Merge: e000dab 11a9d3b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 29 16:25:47 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'devel' of github.com:arangodb/arangodb: (23 commits)
      local cluster start update
      aql editor now handles queries running in the background
      slightly higher timeout for notifications
      oops useless assignement
      arangod/Cluster/ClusterInfo.cpp
      gv save settings bugfix
      Add #2038 to changelog
      Handle multiple request body models
      agency bug resolved
      color optimization query profiling
      Fixed Smart graph injection of collections.
      fix compile warning
      grunt build
      semistandard
      ui - cacheable explain
      improved query ui
      fixed long waits on dropping shardless collections
      lintify
      Faster creation of smart edge collections.
      Make AQL aware of smart traversals for enterprise.
      ...

    Conflicts:
    	arangod/Agency/Agent.cpp

commit 624eec008c842ff0f48a1b259de54097618353c3
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 16:12:38 2016 +0200

    Fix include path for curl..no idea why there is no CURL_INCLUDE_DIRS
    style variable...

commit e8a6173b74490fda4c57ab18708c929ed4f5a22c
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 16:03:28 2016 +0200

    curl static against openssl

commit 522177b71132c6277fd4c08630bbfae3a509fdf8
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 15:20:42 2016 +0200

    Add curl

commit 82eea7a19e722ae5d89efb38140aaadcbd53d398
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 15:19:14 2016 +0200

    making it build partly out of source

commit e000dab111721d8cb9548b26d9e2dc9015a4fbf4
Merge: e08ada2 b3ae63b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 29 10:59:19 2016 +0200

    Merge remote-tracking branch 'origin/curl-communicator' into boost_asio_mops_schleife

    * origin/curl-communicator:
      Remove request unittest
      Implement cURL based inter server communication

    Conflicts:
    	arangod/Cluster/ClusterComm.cpp

commit 25b01518a5fb2ba2d047b082ac6596b44e13008c
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 10:58:30 2016 +0200

    Curl on windows

commit e08ada250ca283d59328c7577f1d3e9affa55aeb
Merge: 8c4ad1d 16d1d21
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 29 10:19:35 2016 +0200

    Merge remote-tracking branch 'origin/devel' into boost_asio_mops_schleife

    * origin/devel:
      ui slow connection bugfix, cleanup
      Updated the general-graph module to ignore SmartGraphs which are enterprise only.
      Fix output of _id attribute for new documents in smart edge collections.
      Fix virtual cloning of LogicalCollections and derived types.
      Describe current format of document _key
      Docs: adds links to AQL traversal for anonymous graphs
      small ui shard fix
      Silence a compiler warning in enterprise mode.
      Remove isSmart attribute in community edition for Agency.
      Improve an if statement.
      grunt build
      modified cluster nodes ui
      ui logos
      added functionality to see the movement status of a shard
      Adding Smart Edge Collection drops to v8-vocbase
      Add SmartVertexCollection.

commit 8c4ad1d63a68c7cfb99cf61cc22148b774b5b0dc
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 29 10:06:19 2016 +0200

    add comment about potential issue

commit 31317b300da44e3f7e19d8fd5a781d3ef5440702
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 09:46:26 2016 +0200

    Make the crc message status (so it doesn't pop up as red in the cmake ui)

commit b3ae63bd7974f762fb2499416402186199811818
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Wed Sep 28 15:59:27 2016 +0200

    Remove request unittest

commit f5bc6efc263d9159c6c2134309c7a8e11d50789d
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Wed Sep 28 15:58:55 2016 +0200

    Implement cURL based inter server communication

commit c5760194cde05ca73426ef4672ba97fe41ac0083
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 15:30:32 2016 +0200

    fix ssl server test (bad weak ptr)

commit 136100991320261b15c0277941992086bfa07c57
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 15:04:50 2016 +0200

    better output

commit 495a3b65fc360c4dd8a1277f129d81bbba57493c
Merge: 635bc9f 8a5bc21
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 14:27:44 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_statistics

    * 'devel' of github.com:arangodb/arangodb: (63 commits)
      elderly cmake compatibility
      spec files rather like 0/1 than fales/true
      Forward isSmart to Agency.
      Restrict _from_ replacement (etc) to the beginning of the string.
      enterprise id lookup
      calculate systemd unit directory in cmake instead of leaning on specfile finding it in some rpm magic
      cluster ui fix
      Fix hanging dbservers in graph tests.
      We don't need go anymore.
      fix sortedness documentation (additional clarification)
      Fix branch choice.
      fix creation of run directories - these shouldn't be in the client package
      updated CHANGELOG
      issue #2079
      Added some smart info into logical collection and make sure that virtual collections are created via load plan
      make relative temporary paths absolute during the system startup. This fixes #1896
      follow redirect for dumpagency
      New depth first search simulators.
      fixed test, typo, optimization
      version info
      ...

    Conflicts:
    	CHANGELOG
    	Installation/Jenkins/build.sh
    	arangod/Agency/RestAgencyHandler.cpp
    	arangod/RestHandler/RestReplicationHandler.cpp

commit 635bc9fae42b7b16fffabebe3303f92e240bbf5f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 14:19:25 2016 +0200

    fix request statistics

commit 9462a446f73f6e82ff870131938f73d3eae3bd25
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 14:15:01 2016 +0200

    silence boost warnings

commit 836289100b64a5f3ef8173446f08eaba60752770
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 10:16:34 2016 +0200

    better log messages

commit 2dbb8d2438f895c380612f0a2bf097928b43191d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 27 14:51:39 2016 +0200

    clean up of KeepAliveTimeout

commit 6c97d8f21dfd4b5e41fa507465875833ca75554d
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Sep 27 12:25:16 2016 +0000

    removed TaskData & chunks

commit 71bd6d83eb7cac58de1a4473af4d4e9e262ab50f
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Sep 27 11:54:32 2016 +0000

    fixed name

commit 821eb554305073325a4b68864cba065705f0fac3
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Sep 27 11:54:20 2016 +0000

    added missing state transition

commit 119171859612b864a290cde321ba1f80ba51eb62
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Sep 27 13:43:17 2016 +0200

    added WAIT_FOR

commit 41e6d3108d64467583a79d3d9dd2096f0dded26b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 27 12:45:12 2016 +0200

    print more info about connection in communication.debug mode

commit 22c83f8b695d745e4531896b4b5815bba1b10eba
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 27 11:14:17 2016 +0200

    fix handling of timeout. add new event after resetting

commit 66c8247e1ce3fb4a69c5375c0f61b2b57f20c217
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 27 09:43:33 2016 +0200

    keep alive timeout is now able to take values less than a second

commit 19b6cf554de78d8fec16cd370243ccc59aa345bc
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 26 16:48:02 2016 +0200

    add keepalive timeout

commit f03757998cae93b3ddc31eded83ea69cebc09039
Author: Mark <mark@arangodb.com>
Date:   Mon Sep 26 14:30:24 2016 +0200

    fixed windows compile errors

commit f4dec34e77f02995bdaba0a73c88aadccad37524
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 26 11:24:15 2016 +0200

    add option for maximal VPackChunkSize to the server

commit a2fccca23411368fa819785223949fefcdc962c8
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 26 09:47:38 2016 +0200

    initialize connection info - server/client address/port

commit 5df04763c03e227965065946b8f170654e36c59e
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 25 11:02:18 2016 +0000

    cppcheck fixes

commit 2a47e4e99bad63c92f1834c738cf30f0e465a1b4
Merge: 278ba49 1bdf414
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 25 10:47:12 2016 +0000

    Merge branch 'devel' of https://github.com/arangodb/arangodb into boost_asio

commit 278ba49a87762365ea37fc3fb5040259a1e3df75
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 25 10:46:45 2016 +0000

    free vocbase on cancel

commit e3b36c8418a816076449be3dea29f865b4952229
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 25 10:28:22 2016 +0000

    check if handle have been installed

commit 92aac95b39c9fc7b3d712b4770e3b3c420626ef9
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 16:21:50 2016 +0000

    fixed batching

commit 92d1335cf2a6bd296c23aa8165718fd4d283af6d
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 14:04:47 2016 +0000

    fixed leak of ListenTask

commit 5d4fb6fd1250e0a30fbe2326d11087ba3ae13b1c
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 11:34:47 2016 +0000

    fixed shutdown

commit c6fb584266818eef765aa8b6727858ab2100859a
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 11:15:05 2016 +0000

    handle shutdown

commit 7dcc50214e3e51ef58d3823ec70534354e1a98eb
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 11:14:54 2016 +0000

    handle aborts

commit 35dd9da84a69dda4103cc82be47d740550d49069
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 10:57:57 2016 +0000

    cppcheck fixes

commit 2f9f7d87005e48904711a9b4a2863ddb98834f79
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 23 20:57:41 2016 +0000

    added cancel

commit b4696026ec9cee01f196a7096a86d29cdf8ce202
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 21:30:10 2016 +0200

    convert _scheduler in SchedulerFeature to unique_ptr

commit 0475c6dd7bdd3c842860e85ad26a607df675d600
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 17:34:07 2016 +0200

    implement synRun

commit a2b365613b5779dd59004b8cfcca04ef145c3ad3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 16:35:34 2016 +0200

    fix error caused by RestHandler not beeing created as shared_ptr

commit 8f19bbb03efa2d2bc6106b8b456040ce7cbb0c68
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 16:32:38 2016 +0200

    fix some cppcheck errors

commit 7694392f73f920df4c033d98025112189d19aa00
Merge: eea0fd7 35e14fd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 14:54:59 2016 +0200

    Merge remote-tracking branch 'origin/devel' into boost_asio

    * origin/devel: (43 commits)
      cleanup
      speed up tests
      add setUpAll, tearDownAll
      modified collection info view
      rechecking dbservers before sharding operations
      updated CHANGELOG
      issue #2072
      adjusted progress indicator delay
      nodes view
      fixed wrong navi route
      updated CHANGELOG for #2071
      updated CHANGELOG
      issue #2071
      fixed compile error
      updated CHANGELOG
      issue #2070
      Some refactoring in Transaction. Also enterprisified document
      FailedServer jobs can report when last FailedLeader has been processed
      Fixed optimization of ANY in Traversals. It was included in the traverser who actually cannot handle it.
      FailedServer jobs can report when last FailedLeader has been processed
      ...

    Conflicts:
    	CHANGELOG

commit eea0fd7c42fc55cd4a1233f458c990186ad6cfc2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 14:31:00 2016 +0200

    improve error handling and reporting in SocketTask

commit 505d55d1a1feff6c93388c5c401273d4199438a7
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 23 11:56:48 2016 +0000

    removed duplicate store

commit 14669814e0eaab9a4c78c8f4396dc88181f6a4fa
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 23 11:34:31 2016 +0200

    missing self for callback

commit 8ad4ee25ef7aaa4cc9cf01d6fe3f56d805e3e9c2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 11:10:31 2016 +0200

    do error handling with error codes instead of exceptions for asio

commit c1d7375c1b0ab0fd3f7f3c682baa2946c05fc4ec
Merge: 9be5942 0e073aa
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 23:03:07 2016 +0200

    Merge remote-tracking branch 'origin/FMH' into boost_asio_merge_frank

    tests broken!

    * origin/FMH:
      added move
      WIP
      WIP
      added shared_from_this
      added shared_from_this
      WIP
      WIP

    Conflicts:
    	arangod/GeneralServer/GeneralCommTask.cpp
    	arangod/GeneralServer/RestHandler.cpp
    	arangod/GeneralServer/RestStatus.cpp
    	arangod/GeneralServer/RestStatus.h
    	arangod/RestHandler/RestBatchHandler.cpp
    	arangod/Scheduler/Scheduler.h

commit 0e073aaee9508129da6b1c83661e08050e172bff
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Sep 22 16:00:28 2016 +0000

    added move

commit 9be5942d18c5dfd66c41c5520b7cdf54025e7ed0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 16:10:31 2016 +0200

    change default chunk size

commit e17d2e4828b1abc4837db0fe7c5ef88d31ddf063
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 15:58:23 2016 +0200

    multichunk sending is now working

commit 3144b72f7883b5b0f3d1df8f4acf0ec996a70e4f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 15:40:43 2016 +0200

    try send multiple chunks

commit f7f1ff11fb47eac7e289b78b9bf4dd0adea0285a
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 14:55:41 2016 +0200

    git commit prepare sending of smaller chunks

commit 50088a7006bc7ac94e4706a50382831214a5c0a6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 14:54:03 2016 +0200

    change cmake for boost

commit 29b00dcd8354144fad5048add5621d657b5f54b1
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 13:12:50 2016 +0200

    fix linking issues on windows caused by auto-linking feature of boost

commit 05da308660cbf67d84a62cdbd11c71e02d8cad7b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 13:12:13 2016 +0200

    remove forward declaration that prevents build on windows

commit 521ce1aebf055fedd9ad42bd63d91d65e4f34f42
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 11:53:11 2016 +0200

    disable autolinking code for linux

commit b67dc616340319591370957149827d2a0e4ad995
Merge: 2ac2440 467a949
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 11:25:56 2016 +0200

    Merge branch 'boost_asio' of github.com:arangodb/arangodb into boost_asio

    * 'boost_asio' of github.com:arangodb/arangodb:
      work on sending in small chunks

commit 2ac244015b6556d52b99906612ff3feaad3d60ab
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 11:25:15 2016 +0200

    update boost in cmake

commit 467a949263a21d1b0af886d01fa471f568c21343
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 10:59:37 2016 +0200

    work on sending in small chunks

commit 4d0816808b701af217db9c4faccd3ef780efb79c
Author: Frank Celler <frank@arangodb.com>
Date:   Wed Sep 21 15:42:06 2016 +0200

    WIP

commit 8c7d3dbca6a34080df1d807e0ec35b57b0acc172
Author: Frank Celler <frank@arangodb.com>
Date:   Wed Sep 21 15:39:54 2016 +0200

    WIP

commit 6d5b19939ae2fbeb157d3773d415b6cf980f3fd5
Author: Frank Celler <frank@arangodb.com>
Date:   Mon Sep 19 17:25:15 2016 +0200

    added shared_from_this

commit b297b3a702de303212edfc3545602b5b4fb987f9
Author: Frank Celler <frank@arangodb.com>
Date:   Mon Sep 19 17:25:06 2016 +0200

    added shared_from_this

commit 5fb39bf9e9ce03c291dadfd48f84f94a12f488d3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 16:47:18 2016 +0200

    fix windows errors

commit b3f71399e12cc5e59e1bbdb4ca87b7d588fb7da9
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 16:36:55 2016 +0200

    add TaskData.h to GeneralServer.cpp and GeneralListenTask.cpp

commit da99cb2e3151f454ef346ded57c2d4865125ab7b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 16:11:49 2016 +0200

    replace magic number with boost::asio::error::would_block

commit a10aa87742153aab5a5aca53815ff44a2abc98f0
Author: Frank Celler <frank@arangodb.com>
Date:   Mon Sep 19 16:11:24 2016 +0200

    WIP

commit 368d62245efad52178acf279ff4f54eb8b03e8e5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 15:35:18 2016 +0200

    add boost to arangod_v8

commit 2ef495a1d1aed97b6eb1c106107a90a27e1891ba
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 15:25:09 2016 +0200

    remove .gitignore

commit 6005aed8b24a40e4fcc6f0569407cd10c8a973c0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 15:18:21 2016 +0200

    fix more windows errors

commit e322da8eb08254c661781cea442cd6e403069ecd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 15:00:48 2016 +0200

    force boost system to be static

commit 6082736132272f600de5f9d76805dde373bc742b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:43:53 2016 +0200

    another fix for windows

commit a36f6930fca35662e21b762bb323c2dc36a05e5a
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:39:02 2016 +0200

    fix add namespace to Socket

commit 38eeda76ad0a145176c5b05ae75d4640a3514cc4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:30:38 2016 +0200

    fix namespace / include

commit 26513ae75a22911d5b4e8584f5e8ae9314469999
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:19:18 2016 +0200

    try to get boost working on windows

commit 00b6416a6452fef0d8e43424ea4e1735c3b0e614
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:06:05 2016 +0200

    replace #warning with #pragma message - windows

commit bf455d30047ebd37a037fc24522bc502854cbbe8
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:03:38 2016 +0200

    improve cmake for boost

commit 6c491e5e784c0c33cf282b5d64026b61d60711a6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 13:39:46 2016 +0200

    apply fix for windows

commit a9f9f429d8eba25b8f7215399e41dd5524bfd76b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 13:33:33 2016 +0200

    replace FAILED with FAIL so windows has no problem

commit 3cbac4115ef183ae38676584abef41b914d2592e
Merge: c614242 19f667c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 13:09:14 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_devil

    * 'devel' of github.com:arangodb/arangodb:
      fixed incompatible replication API responses
      updated CHANGELOG
      added experimental AQL functions `JSON_STRINGIFY` and `JSON_PARSE`
      added experimental support for incoming gzip-compressed requests
      fixed issue #2060
      Added a hash and equals comparator for velocypack that only takes _id into account.
      vs warnings in agency
      Made the Base Traverser Engine pure virtual

    Conflicts:
    	CHANGELOG
    	arangod/GeneralServer/HttpCommTask.cpp
    	arangod/RestHandler/RestReplicationHandler.cpp

commit c614242c4beb2ed12ccb29fcc6fa1db6a4d9090f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 10:49:19 2016 +0200

    try to fix RestReplicationHandler

commit 74b5fc33477107be62a5d86c9c04563cc4d7cac5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 09:12:14 2016 +0200

    remove CMakeFiles form .gitignore so git clean will work again

commit c330b1bff7acb6022b06e2499fa3a065fb820b82
Merge: d400b7f 5772054
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 09:10:39 2016 +0200

    Merge branch 'boost_asio' into boost_asio_devil

    * boost_asio:
      renamed Task2 to Task, EventLoop2 to EventLoop
      WIP
      remove https und vpps commtasks
      WIP

commit d400b7fde3c6a7b6d1c2e2cad600a3fb32b65533
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 08:49:38 2016 +0200

    Revert "remove useless file"

    This file sets indent to 2 spaces for almost all editors,
    this way we do not need modelines or change the default
    editor configuration on systems.

    This reverts commit e0503f7092.

commit 40dcd9ec34e3c741ffdb97d4101e53c49d0ac163
Merge: d5526cf ebb67be
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 08:40:00 2016 +0200

    Merge remote-tracking branch 'origin' into boost_asio_devil

    * origin:
      Remove outdated information about suppress-shape-information which was removed with ArangoDB 3.0, as reported by Tomek on Stackoverflow.
      remove useless file
      updated CHANGELOG
      examples about stacked escaping
      Fix generated MD5sum file
      make methods private
      speed up collection.any()
      speed up skiplist index
      fixed ssl_server test
      examples about stacked escaping
      more diagnostics

commit 8875f7bfc22cc4376b703060e85ac0141706aca5
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 18 22:53:16 2016 +0200

    WIP

commit 57720546a31a59668cd57e99d3dbc11ecfa41a8d
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 16 11:09:39 2016 +0200

    renamed Task2 to Task, EventLoop2 to EventLoop

commit eca7b17f6910fc7892f6a4dbe9c618d3e8f7bf05
Merge: ca473e8 8f2c13e
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 16 10:53:11 2016 +0200

    WIP

commit 8f2c13ec0e2f8a4be4b136bd263affc3054654ae
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 16 09:10:56 2016 +0200

    WIP

commit ca473e8a0eee4ed04994f70b3d52defc9127810c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 16:19:26 2016 +0200

    remove https und vpps commtasks

commit d5526cf1b606daa26be628efa9fdca2fe2664d95
Merge: 5337a01 c912d96
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 16:01:39 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_devil

    * 'devel' of github.com:arangodb/arangodb: (39 commits)
      Fixed compile bug.
      TraverserOptions now support proper subclassing.
      Added a virtual base class for traverser engines.
      all lambdas in ClusterInfo might have been left with dangling references.
      all lambdas in ClusterInfo might have been left with dangling references.
      fix compile error
      Correct path to enterprise js code in testing.js.
      Finding graphs by name now resolve externals one step earlier.
      potentially fix leak
      removed unused flag
      get rid of two pointers in each transaction operation
      redirect output of gdb, so we can append it to the jenkins error mails.
      Foxx: post route example that accepts an array of objects
      implement use-local-time for slow queries as sugested in #2051
      fixed windows compiler warnings
      lookupGraphByName now has a non-enterprise implementation.
      Removed a graph optimization which increased the minDepth if a filter is defined on a higher depth. Under some circumstances this filter can be matched if the path is not long enough.
      fixed issue #2052
      reporting in inception
      fix assertion
      ...

commit 5337a0116ca20726795c59666cdfd6786f93cc82
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 15:53:12 2016 +0200

    ssl server is working again

commit fcedf60588681518b0f6d3eb05661ec0f9e201d7
Merge: 322a08a c912d96
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Sep 15 14:48:54 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into FMH

commit 322a08a86eb9de101d0e37be5e3f6bdbdcb19345
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Sep 15 14:47:19 2016 +0200

    WIP

commit 6f64f39744e3d34c48e69b9a742497d109f2464d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 13:04:46 2016 +0200

    get encryption type via ConnectionInfo in SocketTask

commit abda1c4e1b8e0f05a15a47458fc6c9aaee4abeb4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 09:52:58 2016 +0200

    add ssl support via asio - we are in a broken state now

commit a6a3215f5244a96a48fc5fe4545313018c181b68
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 09:47:36 2016 +0200

    Fix cmake so it works with boost asio

commit baccaa00dc041e01822bfef723d6d285ab2c7ff2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 13 16:20:23 2016 +0200

    add basic changes to enable ssl

commit f7971e2f727ade913ce00958e0ad77e2e4c01613
Merge: c1c7b4e fee42ee
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 13 09:52:44 2016 +0200

    Merge remote-tracking branch 'origin/devel' into boost_asio

    * origin/devel:
      Fixed ASSERTION guarding undefined behaviour on Mac. In some cases the assertion did throw.
      Remove debug output.
      simplified expression
      warning removed
      speed up looking up of revision ids
      Constructor of TraverserEngine is now protected. Preperation for SmartGraphEngine (EE Only).
      Fixed undefined behaviour on Mac. An empty vector was popped.
      semi-fix for long delays in multi-host-agency collection creation/drop
      semi-fix for long delays in multi-host-agency collection creation/drop
      Link the CONCAT_SEPARATOR function.
      Set agencySize back to 1 (temporarily).
      Added a smartSearch route for Traversal Engines. In Community edition this will throw ONLY_ENTERPRISE. It should never be called by our code however.
      Make testing.js find enterprise tests in enterprise version.
      Add global.ARANGODB_CLIENT_VERSION to arangosh.
      Silence gitjslint.sh tool w.r.t. warnings.
      reformat
      Fix which attribute names are allowed for shardKeys.
      Typo fixes in docs
      x-compile portability.
      Silence cpack rpm build.

commit c1c7b4e61e5cecf9794e83f8b3bf5a965d460a53
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 12 12:09:19 2016 +0200

    add boost_system via pure cmake!

commit c5d227eebffe311b24bc1d67c209d53eee0b0754
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 11 21:24:58 2016 +0200

    WIP
2016-10-14 10:12:17 +00:00
Alan Plum c2452ddc99
Fix #2110 2016-10-14 11:54:55 +02:00
Simran Brucherseifer 0482327ff0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-14 11:17:29 +02:00
Simran Brucherseifer 7161227b14 Add docs and test for AQL DISTANCE function 2016-10-14 11:17:29 +02:00
Max Neunhoeffer 79c0f54072 Add more logging about shard creation/dropping/cleaning. 2016-10-13 13:26:20 +02:00
Max Neunhoeffer 039ca9aceb Increase some timeouts from 60 to 90s to be more load tolerant. 2016-10-13 12:52:59 +02:00
Michael Hackstein 13dc4915f8 Added a new isEnterprise function in js internal module. Started to make gharial aware of SmartGraphs 2016-10-12 13:25:56 +02:00