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

13404 Commits

Author SHA1 Message Date
Kaveh Vahedipour 3f3633bd2c supervision to proper preconditioning of jobs on plan 2017-01-27 15:29:22 +01:00
hkernbach c1a04dabb6 ui database refresh fix 2017-01-27 11:39:35 +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 c9b926916a
Even cleaner SyntaxError stacktraces 
Don't clutter stacktraces for Node compatibility at all. Just add lineNumber/columnNumber/fileName to the object.
These are non-standard but there is precedent for these names in Mozilla.
 2017-01-27 05:53:39 +01:00
Alan Plum 88ac5777d6
Clean up SyntaxError generation 
Clobber stacktrace instead of wrapping in another exception with wonky message string.
This makes SyntaxError details node-compatible and parseable for generating code frames.
 2017-01-27 05:34:22 +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 26398db7c4
Add ansi-html, babel-code-frame, chalk 2017-01-27 01:57:29 +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
hkernbach 456e1240f2 grunt 2017-01-26 17:00:44 +01:00
hkernbach a97eacdf02 ui cluster movshard 2017-01-26 16:59:17 +01:00
hkernbach a4e00b8c8d ui routes modified to fit cluster api 2017-01-26 16:54:42 +01:00
Andreas Streichardt a6d0284df5 Properly disable timecritical 2017-01-26 16:01:12 +01:00
hkernbach e69ef40f38 grunt 2017-01-26 15:36:56 +01:00
hkernbach 390f5d02ba Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-26 15:34:25 +01:00
hkernbach db8131e6d7 changed shard api structure 2017-01-26 15:34:14 +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
Kaveh Vahedipour 26167e87fd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-26 11:35:56 +01:00
Kaveh Vahedipour 8509200040 MoveShard with ShortNames 2017-01-26 11:35:44 +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
Simon Grätzer 4c370a09fe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Cluster/ClusterInfo.h
 2017-01-24 16:41:34 +01:00
Andreas Streichardt 83229cbf79 Add wal flush timeout with a default of 30s 2017-01-24 16:29:41 +01:00
Andreas Streichardt 7b1c9b7833 Instanceinfo and testresult will now be written to the test rootdir 2017-01-24 14:54:10 +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
Simon Grätzer e4593743b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-24 00:38:07 +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
Simon Grätzer ed8bdd8e89 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-23 13:23:03 +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
Simon Grätzer 1bd1a52163 Fixed pregel API 2017-01-21 19:00:37 +01:00
Simon Grätzer d1394b466c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 17:30:59 +01:00
jsteemann 35b55fec22 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 17:14:00 +01:00
Simon Grätzer dd14b7b2dd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 15:56:11 +01:00
Andreas Streichardt 657535eec5 Fix port clash 2017-01-20 15:42:28 +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
Simon Grätzer d71ebf7c1d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 14:42:19 +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 dd7c14a3e9 Add minport and maxport so port clashes are less likely 2017-01-20 10:16:55 +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 9ad10acdc0 add mochagrep 2017-01-19 17:58:43 +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 427c8e4553 Merge branch 'devel' into schmutz-ng 2017-01-19 14:53:46 +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
Simon Grätzer e7174beaef Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-19 12:38:11 +01:00
Kaveh Vahedipour 3639e2ad5b inquire in agency interface adjusted 2017-01-19 11:33:01 +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 eb661f95f2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-18 17:26:54 +01:00
Kaveh Vahedipour f47b3b3c9d transient heartbeats 2017-01-18 17:26:45 +01:00
Simon Grätzer 087d4c4151 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-18 15:56:12 +01:00
hkernbach 6ce3dbcfab Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-18 14:58:55 +01:00
hkernbach b36f7e5873 grunt build 2017-01-18 14:58:47 +01:00
hkernbach a238bc4510 fixed several ui bugs 2017-01-18 14:55:52 +01:00
Simon Grätzer 54da6971f1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-18 14:07:13 +01:00
Kaveh Vahedipour aaee2f9e61 transient heartbeats 2017-01-18 13:43:33 +01:00
jsteemann c9a2c028fa emit sort registers for GatherNode in explain output 2017-01-18 11:58:31 +01:00
Kaveh Vahedipour 15c59285d8 inquire interface and clientids 2017-01-18 11:28:51 +01:00
Kaveh Vahedipour 347e668ceb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-18 11:07:39 +01:00
Kaveh Vahedipour ea7e16979a agency bug in precondition and log handling fixed 2017-01-18 11:07:30 +01:00
Max Neunhoeffer c5cfc500ee Improve comments in cluster.js. 2017-01-18 10:47:50 +01:00
Kaveh Vahedipour 769a44c95a ttl timeouts need to be extended. oh my\! 2017-01-17 23:32:38 +01:00
Simon Grätzer f4e02c58a9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-17 22:28:07 +01:00
hkernbach 4426929cb7 grunt build 2017-01-17 19:43:28 +01:00
hkernbach 6791b732b6 fixed invalid jwt login bug 2017-01-17 19:38:26 +01:00
hkernbach b48775d2b6 hide modals when disconnect screen is shown 2017-01-17 19:15:24 +01:00
Kaveh Vahedipour 5de455c8dd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-17 17:33:15 +01:00
Kaveh Vahedipour 54dbf0a814 inquire interface and clientids 2017-01-17 17:33:12 +01:00
Frank Celler d290b74d55 fixed typos 2017-01-17 12:40:17 +01:00
Kaveh Vahedipour 2d21b62007 agency compaction leaves last compaction-keep-size indices behind for reference 2017-01-17 12:15:18 +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
Simon Grätzer 1d66c418b6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/CMakeLists.txt
 2017-01-16 17:56:44 +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 bb5b701d93 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-16 14:10:20 +01:00
Kaveh Vahedipour d7b61f1bde agency tests follow new leader 2017-01-16 14:10:09 +01:00
Simon Grätzer 4821fab2bb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-16 13:59:07 +01:00
hkernbach 5fbfcafb75 ui - fixed login issue within a non system db, when tab was closed 2017-01-16 13:39:45 +01:00
Kaveh Vahedipour aa71fef66f agency-test should not break during reelection 2017-01-16 13:11:42 +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
Simon Grätzer 73f344160d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-14 13:38:00 +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
Simon Grätzer 27dcb11af3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-13 15:00:59 +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
jsteemann 76c6660e28 slightly improve error handling 2017-01-13 09:26:35 +01:00
Andreas Streichardt 1dcbf0850a Implement sync replication 2017-01-12 18:21:37 +01:00
jsteemann e85177b593 fixed cursor printing behavior 2017-01-12 17:26:20 +01:00
Jan 34fddbfff7 Merge pull request #2258 from baslr/patch-7 
restore the cursor position
 2017-01-12 17:18:59 +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
hkernbach e65c0a2ed9 graph ui - load full graph feature added 2017-01-12 16:34:15 +01:00
Max Neunhoeffer fe9116f7fb More Schmutz-NG. 
Does not trigger sync repl yet.
 2017-01-12 16:33:57 +01:00
Manuel B e82c073de3 fix more 
added _printPos to fix the more cmd. thanks @jsteemann
 2017-01-12 13:40:51 +01:00
jsteemann feb954ca45 issue #2256 2017-01-12 12:20:11 +01:00
Manuel B 1f73f0aadd restore the cursor position 
This restores the cursor position after the toString() method consumed the first 10 results.
#2257
 2017-01-11 22:41:27 +01:00
Andreas Streichardt 97b49e79de Add cluster sync tests 2017-01-11 18:18:51 +01:00
Andreas Streichardt 4458f04e46 More specific error codes for the cluster 2017-01-11 17:54:45 +01:00
Kaveh Vahedipour fe48bcb982 fixed for short names in frontend shard view 2017-01-11 16:31:19 +01:00
Simon Grätzer 0b5a1f6b70 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-11 14:47:00 +01:00
hkernbach e798d04d5b optimized ui document error handling 2017-01-11 14:16:08 +01:00
hkernbach fee0555d8c optimized behaviour in ui during truncation 2017-01-11 13:58:54 +01:00
Kaveh Vahedipour abbc32ae33 move shard jobs fail early if the contracting goes south 2017-01-11 12:13:05 +01:00
Kaveh Vahedipour 7b023bd66f move shard jobs fail early if the contracting goes south 2017-01-11 11:50:18 +01:00
Simon Grätzer d857f01d6a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-11 11:29:54 +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
hkernbach 04db0bb98e grunt build 2017-01-10 18:50:21 +01:00
Kaveh Vahedipour bf1199d6c2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 17:30:21 +01:00
Kaveh Vahedipour f34796b432 move resilience should now be correct as a test 2017-01-10 17:30:09 +01:00
hkernbach 4ae274fbd3 fixed cluster parsing issue when node information is not available 2017-01-10 17:07:51 +01:00
Max Neunhoeffer e9630b7aca First set of changes, not yet activated. 2017-01-10 16:54:51 +01:00
Simon Grätzer 9c9d0a6a20 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 16:30:32 +01:00
Michael Hackstein 1f428ae947 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-10 16:04:40 +01:00
hkernbach 0fba37087f typo 2017-01-10 16:00:16 +01:00
Michael Hackstein 0365363090 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-10 15:39:12 +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
Michael Hackstein fe7a829592 trx crud with empty arrays now short-circuit and return success with empty array. This lead to errors in cluster, band now is consistent with single-server. 2017-01-10 15:15:15 +01:00
Max Neunhoeffer f47329f3c0 Mock new structure. 2017-01-10 13:41:16 +01:00
Simon Grätzer 01ac5a51a3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-09 21:12:24 +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 41ca7d17e4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-09 14:45:57 +01:00
Kaveh Vahedipour 13076e9fc1 no locks left in cluster.js 2017-01-09 14:45:44 +01:00
hkernbach 823c20bd84 issue: #2181 2017-01-09 14:23:46 +01:00
Simon Grätzer 20d32d05b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/VocBase/LogicalCollection.cpp
 2017-01-09 13:34:37 +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
jsteemann f69985014b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-09 10:59:15 +01:00
jsteemann 503326852c try to fix test for MacOS 2017-01-09 10:58:58 +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
jsteemann ef76ab38cc fixed test 2017-01-06 15:29:01 +01:00
Kaveh Vahedipour c533f311cb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-06 14:47:02 +01:00
Kaveh Vahedipour a0af781630 to lock or not to lock 2017-01-06 14:46:57 +01:00
Frank Celler 9290d89412 removed superfluous dashes 2017-01-06 14:15:45 +01:00
Kaveh Vahedipour fbce62b558 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-06 09:38:43 +01:00
Kaveh Vahedipour e87182d971 more verbose output on failure to create plan 2017-01-06 09:38:37 +01:00
Andreas Streichardt 975e7a65b2 Fix cluster internal requests in authentication enabled cluster 2017-01-05 16:20:15 +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
Wilfried Goesgens 19b8c90bcb fix examples - reset collections cache when working with the graph api 
- add dummy cache flush function into the arangod db object
 - call cache flush when creating and deleting graphs
 2017-01-04 14:34:26 +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 118a4a7778 more cache invalidation 2017-01-03 14:58:13 +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 084c3e2e73 more robust agency test 2016-12-30 11:33:58 +01:00
Kaveh Vahedipour 4928358e04 removing trace of agency locks part 1 2016-12-30 11:21:11 +01:00
Simon Grätzer 7563fb4b80 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-29 18:09:57 +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
Simon Grätzer 9a6c7196a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-26 20:52:29 +01:00
Andreas Streichardt bceb5d7b46 disable cores during recovery setup 2016-12-22 16:40:51 +01:00
Simran Brucherseifer 9c0bf74de3 Fix link to Example Graphs section in docs 2016-12-22 15:11:36 +01:00
Simon Grätzer 344c3761ba Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-22 14:51:55 +01:00
Andreas Streichardt 97ac8d6be2 remove transact test 2016-12-22 13:43:17 +01:00
Simon Grätzer 52a88488d6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-21 23:16:41 +01:00
Jana 41e74eaa8e Open link in a new tab 2016-12-21 14:45:07 +01:00
Simon Grätzer 431df0c5a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-21 11:56:44 +01:00
Jan Christoph Uhde c364c3c1d6 fix jslint errors in geoindex test 2016-12-20 12:07:50 +01:00
jsteemann dc922a3e82 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-20 08:50:57 +01:00
jsteemann 8e8e064429 fix jslint for crypto file 2016-12-20 08:50:44 +01:00
Alan Plum 99ba80a542
Fix off-by-one in Foxx route 2016-12-20 01:43:14 +01:00
Simon Grätzer 007134accc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-19 13:23:43 +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
Simon Grätzer f1b6170e96 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-19 10:17:18 +01:00
Simon Grätzer 96925c0e76 Working single phase async 2016-12-19 07:25:52 +01:00
Alan Plum e0fe78b782
Implement HOTP/TOTP 2016-12-19 02:20:53 +01:00
Alan Plum 61301a391b
Expose PKCS5_PBKDF2_HMAC to JS 2016-12-19 02:20:51 +01:00
Alan Plum 9a347f74fa
Cleanup crypto.js 2016-12-19 02:20:29 +01:00
Simon Grätzer 7afebc2223 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-17 14:10:03 +01:00
Max Neunhoeffer a7f295bfe8 Fix error handling in resilienceMove test. 2016-12-16 11:02:13 +01:00
Simon Grätzer d1a47f5b29 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-15 18:46:21 +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
Simon Grätzer e4951835aa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-14 10:40:03 +01:00
jsteemann 3be94b6014 add caching for db._collection() on client side 2016-12-13 16:05:29 +01:00
jsteemann 4d76ef962b added count(details = true) for sharded collections 2016-12-13 16:03:49 +01:00
Kaveh Vahedipour 1c6837d0d9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-13 15:36:23 +01:00
Kaveh Vahedipour 842d1030f0 Fixed dangling UUID problem in missing database directory 2016-12-13 15:36:19 +01:00
jsteemann 03acaaea47 fixed issue #2217 2016-12-13 14:19:55 +01:00
Simon Grätzer 3a4a07f13d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-12 13:21:51 +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 cd98d53ec4
Add swagger route to Foxx API 2016-12-12 02:32:49 +01:00
Alan Plum f2a6864db4
Require at least one arg in route def 2016-12-12 02:32:49 +01:00
Simon Grätzer 4fe234803e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-09 17:37:51 +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
Simon Grätzer 820c5e0bc0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-09 15:51:11 +01:00
Andreas Streichardt c7ef0dc63a Update zwagger 2016-12-09 15:30:03 +01:00
Alan Plum d8bf7252e2
Document OAuth1 2016-12-09 15:28:36 +01:00
Simon Grätzer 730ea4755e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	scripts/startLocalCluster.sh
 2016-12-09 14:30:19 +01:00
Andreas Streichardt 9fedba9fff Fix eslint 2016-12-08 10:14:50 +01:00
Andreas Streichardt 82682f8d25 Wait for synchronous replication to settle 2016-12-07 18:38:15 +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
Kaveh Vahedipour 30a0243e3d redirects to myelf should be hinstory 2016-12-06 18:05:05 +01:00
Andreas Streichardt 11bd9381d5 Add satellite collections 2016-12-06 16:40:50 +01:00
Simon Grätzer b126e1dddb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-06 14:57:09 +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
hkernbach a6ec84af9a node view now using short name 2016-12-05 12:17:06 +01:00
Simon Grätzer 3142cc1505 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-05 01:19:56 +01:00
Simon Grätzer 0689ccaabb fixed some stuff, stopping still not working 2016-12-05 01:18:05 +01:00
jsteemann 2aa414f731 fixed issue #2204 2016-12-02 13:59:48 +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
jsteemann dc5384609c jslint 2016-12-01 14:39:28 +01:00
Simon Grätzer 34714f8743 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-01 14:11:14 +01:00
Michael Hackstein 0bdf926942 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-30 12:56:46 +01:00
Kaveh Vahedipour 805f894368 fixed faulty output when primary db server from changeSecondary api could not be found 2016-11-30 11:27:54 +01:00
Michael Hackstein 1b5df32d8d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-29 12:49:19 +01:00
Michael Hackstein 0f119172dd Added convenience function to create vertexCentric indexes. 2016-11-29 12:31:25 +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
Simon Grätzer bc4c441f30 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 17:03:26 +01:00
Michael Hackstein d72d129860 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-25 16:09:06 +01:00
Michael Hackstein 0786eb735f Fixed passing of unique when using createHashIndex() 2016-11-25 16:08:58 +01:00
Kaveh Vahedipour 029ff44bb0 Merge back FMH to devel 2016-11-25 16:03:13 +01:00
jsteemann c784c54799 fix failing test 2016-11-25 15:45:59 +01:00
Michael Hackstein 69afcc0501 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-25 12:58:57 +01:00
Michael Hackstein 7c96010711 Reincluded ensureGeoConstraint. Somehow got lost in my last commit. 2016-11-25 12:58:48 +01:00
Simon Grätzer 9bcf8cd407 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 12:30:39 +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
Kaveh Vahedipour 41e1ba144f general transactions in agency comm 2016-11-25 09:24:41 +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
Simon Grätzer 66951f4f8e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-23 13:17:27 +01:00
Kaveh Vahedipour 681455777c Merge remote-tracking branch 'origin/devel' into FMH 2016-11-23 08:51:51 +01:00
Michael Hackstein 90c646fc54 Added another smart graph error that disallows using system attributes for smart graphs 2016-11-22 17:54:12 +01:00
Kaveh Vahedipour f0e1168e5a Merge remote-tracking branch 'origin/devel' into FMH 2016-11-22 17:48:36 +01:00
Kaveh Vahedipour 9733dcc724 Looks as if cluster.my-local-info and cluster.myid are for the past 2016-11-22 17:48:04 +01:00
Simon Grätzer cbaca25ba1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-22 15:15:33 +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
Kaveh Vahedipour ab34880bea Merge remote-tracking branch 'origin/devel' into FMH 2016-11-22 10:30:25 +01:00
Andreas Streichardt 2abc46f3e6 fix shardview...no more endless loops during shard rebalancing...also 
fix error management when trying to reach dbservers
 2016-11-21 17:47:06 +01:00
Simon Grätzer e4bc60a755 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-21 17:44:12 +01:00
jsteemann aa5bd85b4f fix log message 2016-11-21 14:06:10 +01:00
jsteemann 63f0b53db5 removed useless log message 2016-11-21 14:04:16 +01:00
Jan Steemann 689c7fbdc3 fixed issue #2183 2016-11-21 13:41:49 +01:00
Jan Steemann 0ff5e4c07c wrote tests for shell return codes 2016-11-21 11:34: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
hkernbach bfda3d4bc0 ui: better smart graph support 2016-11-18 15:18:25 +01:00
Alan Plum e12ba2ad3b
Allow descriptions in Foxx dependencies 2016-11-18 15:13:25 +01:00
Simon Grätzer 9b1a11e68f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-18 14:44:29 +01:00
Kaveh Vahedipour eec8f22953 Merge remote-tracking branch 'origin/devel' into FMH 2016-11-18 12:19:53 +01:00
Alan Plum 2ed6d8cc3e
Discard unknown Foxx configs in production 
Fixes #2162
 2016-11-18 11:47:00 +01:00
jsteemann be7ab673f1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-17 17:31:34 +01:00
jsteemann 6b8157625f fixed test 2016-11-17 17:31:28 +01:00
Alan Plum a73ce31e7b
Change format of Foxx API listScripts route 2016-11-17 17:29:51 +01:00
Alan Plum 4ee67e1660
Fix CORS test 2016-11-17 17:29:50 +01:00
Kaveh Vahedipour a8339e5b4c Merge remote-tracking branch 'origin/devel' into FMH 2016-11-17 16:21:38 +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
Jan Steemann e0831b1897 fixed missing description 2016-11-17 14:58:37 +01:00
hkernbach 5668141572 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-17 11:59:45 +01:00
hkernbach 5106fee4b8 fixed issue: #2161 2016-11-17 11:59:36 +01:00
Simon Grätzer 0ae6d0d6fd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-17 11:56:29 +01:00
Alan Plum 04d70bbfe8
Add development option to Foxx API install 2016-11-17 11:29:53 +01:00
hkernbach e49e872214 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-17 11:17:31 +01:00
hkernbach 2fb13ebda6 better cleanup in gv 2016-11-17 11:16:50 +01:00
Alan Plum 5978461ffe
Add download route to Foxx API 2016-11-16 18:49:56 +01:00
Alan Plum ce154316b1
More graceful handling of contributors without e-mail in Aardvark 2016-11-16 16:44:31 +01:00
Kaveh Vahedipour ffe7f9f3ad merged in devel 2016-11-16 14:59:53 +01:00
Alan Plum 89b59a522a
Add tests for Foxx path logic 2016-11-16 11:38:00 +01:00
Alan Plum ff415076d9
More convenient `@arangodb/request` 2016-11-16 11:37:59 +01:00
Simon Grätzer c97a0b825c Runtime Statistics, fix in javascript 2016-11-16 11:09:09 +01:00
Jan Steemann 1ad7d5e4a4 removed warning 2016-11-16 10:20:28 +01:00
Simon Grätzer 84ca321fe5 Fixed javascript API 2016-11-15 23:19:44 +01:00
Simon Grätzer 4b3a5a414e More js APIs 2016-11-15 21:19:36 +01:00
Simon Grätzer 42782e4e28 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-15 18:14:50 +01:00
Simon Grätzer 5b08879209 Added pregel arangosh code 2016-11-15 18:14:35 +01:00
Alan Plum d1c52e696c
Merge branch 'dotdot' into devel 2016-11-15 18:10:17 +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
hkernbach 1e44df85ca fixed #2169 2016-11-15 16:08:40 +01:00
jsteemann 77e2cf5a65
fix passing of special chars in URLs in cluster 
- this sets option CURLOPT_PATH_AS_IS to keep ".." and other special components in paths
- this also changes the behavior of StringUtils::urlEncode() to always encode the "."
  character to "%2e"
 2016-11-15 15:46:22 +01:00
Alan Plum facee370fa
Fix static file serving for paths wth dots in them 2016-11-15 15:41:33 +01:00
hkernbach c47ec3bbd5 eslint 2016-11-15 15:32:11 +01:00
Heiko Kernbach aa55634419 eslint 2016-11-15 15:31:30 +01:00
hkernbach 1649b2cd59 added rule to eslint conf 2016-11-15 14:40:21 +01:00
hkernbach d245cda324 replaced grunt semistandard with eslint 2016-11-15 14:31:07 +01:00
Wilfried Goesgens 330ec1c5cb fix lint 2016-11-15 12:55:03 +01:00
Jan Steemann 19f771fcd6 issue #2168 2016-11-14 17:30:19 +01:00
hkernbach b8fd680df7 ui aql graph preview default is now canvas 2016-11-14 12:50:53 +01:00
Alan Plum 5788b2e3ca
Fix failing test 2016-11-13 15:08:40 +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
jsteemann fcacd76bca display index usage of traversals in AQL explainer output (previously missing) 2016-11-10 12:49:02 +01:00
Jan Steemann 6d6d5b9a00 test for issue #2149, issue #2159 2016-11-09 16:29:58 +01:00
hkernbach 22e63fe308 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-09 14:48:33 +01:00
hkernbach e6a448230e fixed part of #2067 2016-11-09 14:48:29 +01:00
Jan Steemann a64127fdd8 added missing functions 2016-11-09 08:06:53 +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 836905d341 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-08 16:09:18 +01:00
Jan Steemann f0f90bc914 small fixes for traversal explain output 2016-11-08 16:08:58 +01:00
hkernbach 4f7b5c2249 optimized resizing 2016-11-08 15:39:49 +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
Alan Plum 0779b99d99
Fix Foxx development mode HTTP API 2016-11-08 13:23:24 +01:00
hkernbach fcabefbe12 optimized docs view 2016-11-08 11:42:26 +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 3e49650d17
Bump graphql-sync to 0.6.x compat 2016-11-06 13:30:03 +01:00
Alan Plum ccb251e1f5
Better handling of routers & middleware in Swagger 
Fixes #2148.
 2016-11-04 20:06:08 +01:00
hkernbach 2dce0a9c8b js semistandard 2016-11-04 14:51:06 +01:00
hkernbach 5efb3d2ce8 ui added regex filter 2016-11-04 09:47:15 +01:00
hkernbach d19e314b04 fixed display of wrong version within the login screen 2016-11-03 17:05:36 +01:00
hkernbach 2fdaca29df added aql graph preview fallback to json if graph engine fails 2016-11-03 16:30:33 +01:00
jsteemann fa56edf192 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-03 12:20:40 +01:00
jsteemann b7257b196d safety first 2016-11-03 12:20:33 +01:00
hkernbach cd00bd8d07 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-03 11:44:35 +01:00
hkernbach 8ba0ecc194 added shortcuts to in/decrease font size in aql editor 2016-11-03 11:44:28 +01:00
Alan Plum 735f0e5f6c
Resolve 'lib' for 3.x services 
Fixes #2139.
 2016-11-03 10:35:06 +01:00
Alan Plum ce79aa9d18
Bump dependencies to latest versions 
Fixes #2138.
 2016-11-03 10:35:06 +01:00
hkernbach e669d64b6a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-11-03 09:37:17 +01:00
hkernbach c345474bca optimized version indicator 2016-11-03 09:37:11 +01:00
jsteemann 096c01af22 fix typo in message 2016-11-03 00:42:53 +01:00
jsteemann 68317bb4f2 added experimental `REGEX_REPLACE` AQL function 2016-11-03 00:40:19 +01:00
jsteemann cae493f060 increase default number of results for AQL editor 2016-11-02 22:19:44 +01:00
jsteemann cf27b1d5c5 fix bugs in front-end query builder 
- filtering on multiple, different attributes did not work
- select boxes for filter operators did not contain IN, NOT IN and like for all but for the top-most select box
 2016-11-02 22:06:03 +01:00
hkernbach 4ab8671bff issue #2131 - display process and error of pending or failed index creations 2016-11-02 14:56:49 +01:00
Simran Brucherseifer 9f2ad47aa4 Aardvark: Prevent logo from touching main content 2016-11-01 13:03:30 +01:00
Alan Plum f630020269
Expose static req.reverse as module.context.reverse 2016-10-31 17:38:11 +01:00
Alan Plum 41c0f6928d
Allow passing config & deps on install/upgrade/replace 2016-10-31 16:13:32 +01:00
jsteemann 62632a52c1 Merge branch 'unique-indexes-on-more-than-shardkeys' of https://github.com/arangodb/arangodb into devel 2016-10-31 16:00:34 +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
jsteemann 2a371cbf9e allow creating unique indexes on more attributes than present in shardKeys 
The following combinations of shardKeys and indexKeys are allowed/not allowed:

shardKeys     indexKeys
        a             a        ok
        a             b    not ok
        a           a b        ok
      a b             a    not ok
      a b             b    not ok
      a b           a b        ok
      a b         a b c        ok
    a b c           a b    not ok
    a b c         a b c        ok
 2016-10-28 13:04:12 +02:00
Andreas Streichardt f9204cf71c Remove useless debug output 2016-10-28 12:50:22 +02:00
Kaveh Vahedipour 32049dd2c5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-27 15:18:23 +02:00
hkernbach e5abaffa6d removed console log, optimized offline view 2016-10-27 15:05:33 +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
hkernbach 451c115223 grunt 2016-10-27 13:50:35 +02:00
hkernbach 693109de47 fixed event loop bug, optimized nodes view 2016-10-27 13:50: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 4770e38fa1
Don't load mocha QUnit interface 
The QUnit interface interferes with the BDD and TDD interfaces resulting in weird inconsistencies.
 2016-10-26 15:24:56 +02:00
Frank Celler 62f4acc325 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-10-26 14:49:16 +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
Kaveh Vahedipour 457034b305 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-25 16:26:09 +02:00
Jan Steemann 70b6bff545 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-25 15:52:40 +02:00
Jan Steemann eead95db34 issue #2118 2016-10-25 15:50:42 +02:00
Kaveh Vahedipour e7f8bf7d7d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-25 15:08:04 +02:00
Kaveh Vahedipour f8235b9c63 agency locks code review 2016-10-25 15:07:57 +02:00
hkernbach 23e15889c7 fixed shardDistribution info route 2016-10-25 13:40:28 +02:00
hkernbach 4e23a6911d moveShard api changed 2016-10-25 10:09:03 +02:00
jsteemann 09e1fda1a0 fix revision id handling 2016-10-24 17:24:27 +02:00
Jan Steemann b9a807092b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-24 15:26:37 +02:00
Jan Steemann 8f785e1701 generated API docs 2016-10-24 15:26:23 +02:00
hkernbach f8b7b602ba gv colors 2016-10-24 14:11:16 +02:00
hkernbach 1fd4625188 gruntfile cleanup 2016-10-24 14:08:25 +02:00
jsteemann de9dc289c0 Squashed commit of the following: 
commit f14e88b6259212b33843653292d95a607ff894a3
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Oct 23 11:03:30 2016 +0200

    clang does not like reinterpret_cast

commit 96920079514965e792bf9688cb51cdad944692f4
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Oct 22 13:52:47 2016 +0000

    honor minimal

commit a460c3df878b9e8b544812f0fda471c1fe519458
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Oct 22 12:23:16 2016 +0000

    added hidden options server.maximal-threads and server.minimal-threads

commit 38713a0a614550b38f4eb650ff62300732f90298
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 11:17:17 2016 +0200

    fix test

commit 532d65e0d22fc6916b36d6fda23ab95cd34c1ac2
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 11:17:03 2016 +0200

    re-added methods needed by EE

commit b7624580e7809baa0cdf9145e2102952e872346b
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 01:11:50 2016 +0200

    cppcheck

commit da5e02351ec7872302840ca14f67aeda8ab3150b
Merge: e216800 d19beb6
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 01:04:51 2016 +0200

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

commit e2168009bde63971d5c7a17653c26a6f9ae23c3c
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 01:04:30 2016 +0200

    fix non-deterministic inserts into edge index

commit 6b131ee1143f17f5465a8423921b7a96c382013e
Merge: 8ebf7f0 285ddb8
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 21 12:23:53 2016 +0200

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

commit 8ebf7f043efcda7fd31e1e78c6a0da99cc461b89
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 21 12:23:36 2016 +0200

    micro optimizations

commit ad32930b9e50ea52cb9821508912ddd80564193f
Merge: b40cfb4 fdb2104
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 21 09:10:31 2016 +0200

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

commit b40cfb44dd4861471385d30f3777b17ba2995ef1
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 16:07:40 2016 +0200

    share some context

commit 2411e59f2bcbd96889aac36e0a38ad62dca1ea65
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:48:05 2016 +0200

    remove unused functions

commit c422037e97572605cce4895c5cdb4b8ffa30f287
Merge: 9e9a2f7 88ea314
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:31:14 2016 +0200

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

commit 9e9a2f7c9428f333fa3c7674bb82853574ea2f2c
Merge: cedced5 638ce07
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:30:27 2016 +0200

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

commit cedced52c3dfcefdc8d5ca57924064b350e338e8
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:30:14 2016 +0200

    experimental improvements

commit 455cb59bc641d8137d635d1ff6a137183c455b00
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 13:25:36 2016 +0200

    pass argument by reference

commit b922a14d984dc82d55d54297552778342b6cea64
Merge: 8afd5d3 0883c49
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 13:19:59 2016 +0200

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

commit 8afd5d35d562de4596af5b5acf1909f3c232ed60
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 13:19:47 2016 +0200

    micro optimizations for shortest path

commit e92edcc7f5dcb1429052d337eeb10b087f5dfac0
Merge: eb2d774 084961a
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 11:50:42 2016 +0200

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

commit eb2d7747d81bc0105579ad2e6f19a4743bd217a8
Merge: 146d3e3 b376769
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 11:30:14 2016 +0200

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

commit 146d3e3b90304897459ecde3b9d9b282042a412f
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 11:29:41 2016 +0200

    mini optimizations for traversal

commit a8cfa933c8f96840a4dca355a1efee2086a5cf2d
Merge: b990d0f c3de3ca
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 10:37:35 2016 +0200

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

commit b990d0f6914d4c483f9e521d0132937eb0aa5bc4
Merge: deea0b0 090a591
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 10:37:31 2016 +0200

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

commit 090a59103feac32b848f18fafdb4f97816bf92f6
Merge: d8537ef 4bf4c7f
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 09:14:52 2016 +0200

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

commit deea0b00b1ac35b4b23756218d2c12ab72185b09
Merge: d8537ef 4bf4c7f
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 09:14:40 2016 +0200

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

commit d8537ef56e537356e32b82e10cd2b9833c542bb8
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 17:16:42 2016 +0200

    potential performance improvements

commit 828ac8743ce67a964bd2d622689cf3c69b7aa22e
Merge: e696a95 76ec1fd
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 16:38:18 2016 +0200

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

commit e696a95b50db1a8819247ef855b0dad710b4cc62
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 16:37:07 2016 +0200

    dont pass nullptrs

commit 5b31ff978091fa1ae80d59b6ba7bad63f0c83ef7
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 16:36:45 2016 +0200

    fixed shutdown order

commit 8698892b6e9395151dcfdca778ad9177b19b1614
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 15:25:21 2016 +0200

    added assertions

commit 8bcc2d4610ae0c15f6406b82568e3a15a8f6df5a
Merge: 1f0676b 92b5887
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 15:16:24 2016 +0200

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

commit 1f0676b9e95dc47a2c573380c6d165f875fe6e87
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 15:15:06 2016 +0200

    potential performance fixes

commit 3eeee4a904079d33d6fd695100afc080acde1dc7
Merge: c111396 14d8d35
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 11:39:22 2016 +0200

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

commit c1113968db5fd9e4cefa8be0150dafc37cf1e25f
Merge: 4db8b2c cd3a5b4
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 09:08:28 2016 +0200

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

commit 4db8b2cbb75218391b6499de7a35bca480546031
Merge: 241e0ab e181457
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 17:48:12 2016 +0200

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

commit 241e0abbee7d040eeadfa2d0fd195f21a4eac0d4
Merge: ed309a9 93c5672
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 17:48:05 2016 +0200

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

commit ed309a9abaf3185af7e4ed75278eb78716e18935
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 16:25:32 2016 +0200

    fix compile error

commit a53793c63988ac4e4ba8a074f61e8130c01aea04
Merge: ddfc6eb 1d7f929
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 16:13:32 2016 +0200

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

commit 93c567295186197236fd8d4a2f25109167e57c6c
Merge: ddfc6eb 1d7f929
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 16:07:10 2016 +0200

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

commit ddfc6ebbd475a238cfe23ed9b9860ea8ed840355
Merge: 762d01e 0d1572c
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:40:57 2016 +0200

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

commit 762d01ed7c58c2981c8f7ff8f0736e47d34006df
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:40:45 2016 +0200

    hold mutex for shorter period

commit 74f5e8a402ec7f94606053acf3361225d7140bee
Merge: ece92b5 6bc276e
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:30:36 2016 +0200

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

commit ece92b50a7f87685e7b3e9b2503ec224573b7663
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:30:17 2016 +0200

    performance optimizations

commit 979b5e29a3f707104fe70e632fc2f701fc8b731b
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:29:56 2016 +0200

    don't use pointers

commit 3f30c6d849d586c01020bb093d094dce91f14d13
Merge: ab3af79 0baecf1
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 14:16:36 2016 +0200

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

commit ab3af79ca3f608df621bc98966e8d93bd848d401
Merge: 818f576 3c96c6f
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 14:14:37 2016 +0200

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

commit 818f576580683704147f113208f2376de8eed9da
Merge: 19e1488 1c1a659
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 09:24:15 2016 +0200

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

commit 19e1488220cecfb0588f9b49b9f6cc26ea6fa93f
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:55:25 2016 +0200

    use half of RAM for target size

commit aef5156b7d131b47d7deacf30f20ad1dde79b843
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:51:28 2016 +0200

    revert boost changes

commit 294517d36f2c35757593b705ac2a5e56f3d9b9dc
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:51:20 2016 +0200

    fix compile error

commit 80b7560a041fd80e5b0199b5ae1cbe0a96d118a5
Merge: b220f79 f748bab
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:42:50 2016 +0200

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

commit b220f795b686a1b7a8c7f1eb50b32eee5ff573ae
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:42:16 2016 +0200

    stability fixes

commit 4751c25ef42cbc2f688dbe9761453e6a1209d959
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 10:34:42 2016 +0200

    silence boost compile warnings spam

commit f7f7cbeedc8881feb4eec45591f70b24a3d9292b
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 10:34:29 2016 +0200

    fix compile warnings

commit d1e3f35e55963666d85c5084cb01dc8330866249
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 10:34:14 2016 +0200

    change warning to fatal error

commit e858e5f6bbfd1ad5a32eea66fe7881d795527af4
Merge: cbe8299 0586862
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:58:46 2016 +0200

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

commit cbe8299d8b127588533d8a292e46d77f889a8845
Merge: 4859562 df391b2
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:30:24 2016 +0200

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

commit 48595629fe43531d9fbbd5b982cb3c78b18b17f2
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:30:03 2016 +0200

    move most-accessed property to the front of the struct

commit 660e3e3b94bc0b2ef5783097886939c67c6b1d27
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:29:52 2016 +0200

    don't create too many lookup contexts

commit 6c8a93b9ed4157511b04262bc429ae4df3531575
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:21:21 2016 +0200

    no copying of results in HashIndex

commit b91c040b70afc02b1e7a22a9b6e223bbac254f55
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 16:57:48 2016 +0200

    privatize methods

commit 70d8d6e50545b097e9e5c7dfdd0cc210af8ce3b8
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 16:43:07 2016 +0200

    don't spam on shutdown

commit c3d37194513f4576a41cc41408af4bac7a5084ca
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 16:42:58 2016 +0200

    share IndexLookupContext

commit ed8362422d3bb8d8462820581ea029209fb80387
Merge: e674f2b 73f87e8
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 14:17:46 2016 +0200

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

commit e674f2bd5f419243461c5b34fa507277fabdffb3
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 14:17:22 2016 +0200

    transition static array chunks cache into an unordered set

commit ceb1dc126efa28a2cfca2f73037b6a3df57d99b2
Merge: 254e167 0a82f16
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 13:31:20 2016 +0200

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

commit 254e167f5195cd316dda8a79bd3103848bd09ba8
Merge: ce5ea17 f1c3c89
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 12:42:50 2016 +0200

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

commit ce5ea175f0dec9634577d9f8bf691aea8985b9d4
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 12:42:32 2016 +0200

    remove locks in case they are unnecessary

commit 0277c938871cee66e9ef1486efe8ab0d3be24885
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 12:42:11 2016 +0200

    fixed bad optimization

commit 2db9e3534e4b9f7cb54c7b8ce52913334535b876
Merge: e408593 8c7034e
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 10:47:57 2016 +0200

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

commit e40859312d25a42ee41640341ece78255ab5d0df
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 10:47:41 2016 +0200

    performance optimizations

commit 6c9f19b06fc428581bee193cd7a3b9ce5a7219bb
Merge: baf397b df977e6
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 13 11:16:06 2016 +0200

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

commit baf397befd61cbb072c0cebc27bf72726f22d21a
Merge: 2c43c62 d229ac3
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 13 09:41:40 2016 +0200

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

commit 2c43c6242ea606428789b2e33295610e1b2d15f0
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 13 09:41:24 2016 +0200

    performance optimizations

commit 6304f67551dbdfc82579e37d5b02f1c73bdfe4e4
Merge: 8504836 bf8da24
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:30:34 2016 +0200

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

commit 8504836efa2da621cb15e028dfae2f7608d37383
Merge: c4e27d0 48d29c9
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:30:28 2016 +0200

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

commit c4e27d0ad85fcef3b5456bf9a2e43d717fa634e9
Merge: 95aad69 ed13299
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:19:50 2016 +0200

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

commit 48d29c9abe585801c1df96fcbac73498d5f41fa7
Merge: 95aad69 ed13299
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:19:50 2016 +0200

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

commit 95aad698140f38e07d19b693075b008fbb0c5681
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:18:42 2016 +0200

    use relative include path

commit 7e410c86cf6e5f5e2431801728f9683daa70a8c0
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:18:26 2016 +0200

    simpler iteration over all documents in a collection

commit 49eec355dfbc4a5812245adc7199de0ae74a35c3
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:11:45 2016 +0200

    micro optimizations

commit f7e2d008f32d9526a525ddb15ac696b2af6eacae
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:10:16 2016 +0200

    move seldomly-used code into own function

commit 7fb500e0bf97fa9b1be497cbae4c0022bb101615
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:09:56 2016 +0200

    micro optimizations

commit debf61f9563f00a34028e31ea91fdd8274b5c401
Merge: 1a1024d 053e7fc
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 12:15:12 2016 +0200

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

commit 1a1024d38563f4cb08c68be0d5a891fcb2414954
Merge: 89414ef 001407d
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 08:47:14 2016 +0200

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

commit 89414efadcfc3db01e43d2baa5ef6d12f627aa17
Merge: 221ae0d 0bfe447
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 17:12:03 2016 +0200

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

commit 221ae0d34e6d6316dd7079c3c025a5b890a7a273
Merge: ee038eb e75b8f5
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 16:46:09 2016 +0200

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

commit ee038eb2115b021de5f5301edb8c4e4337e3faad
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 16:45:49 2016 +0200

    index refactoring

commit 20739bdffca0104bceb603073f7a50023febbdf1
Merge: 9c356e4 5d65b0b
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 09:11:06 2016 +0200

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

commit 9c356e462ebcf05dd37ba424d2d9b1d007d3164c
Merge: e50a934 8aa34ec
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 7 16:19:14 2016 +0200

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

commit e50a934b151e7a92d916ce8ffb0ca167bfb02e10
Merge: 00e1fff 51dd5a9
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 7 16:19:08 2016 +0200

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

commit 00e1fff3b0e7bff7afd74023aa24b2abd061fe42
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 7 15:15:34 2016 +0200

    changed primary index to not use pointers

commit 0318f177e13a2c9d5e3f8473d8b63de505f5d80b
Merge: 6230439 3fc8677
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 16:28:18 2016 +0200

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

commit 6230439538c73bd3e2bf553bea6a53f91db1db28
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 16:28:05 2016 +0200

    remove _extraMemory

commit bf5b4f957751fa0fc6702da62ce46a008613a99d
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 16:27:52 2016 +0200

    index API preparation

commit 5a2d19daa5f0c95131733eb94ea9182fa5b8f822
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 15:19:15 2016 +0200

    fix API

commit 4835ba6ca3ed071e477bf69cec4eec1b9b46b12a
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 15:19:08 2016 +0200

    removed garbage

commit a8f29ad166d50cb85bf0f95a0594d8a8baf3043b
Merge: d559c31 f790795
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 15:02:29 2016 +0200

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

commit d559c316922e06c3cf5da6654afe9aeae15a8d5f
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 09:13:58 2016 +0200

    cppcheck

commit 89f525278e87d0ae926367f5c2fdb08faba4932f
Merge: 6ba81c2 21beb09
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 09:05:19 2016 +0200

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

commit 6ba81c27e6cfa425c2a59569a371707abd2aa8f3
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 09:04:59 2016 +0200

    enable disabling _rev checks for pre-release 3.1 data

commit 21b701c1792d8eeaa0321ce494fafe9102c1ba9a
Merge: 1bddd76 11a9d3b
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 16:24:18 2016 +0200

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

commit 1bddd7645fb3761eb2946b21f08f5189dadadf11
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 16:24:00 2016 +0200

    free unused cache memory more eagerly

commit 0136e2f0514c9fc2b35a5d21b72a3ebb64c0aaaf
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 16:23:52 2016 +0200

    renamed variable

commit 9c276a069a24f5d4544b7147efe57679c039eebf
Merge: 7c70abb 93cb87e
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 15:37:59 2016 +0200

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

commit 7c70abb2ce45858aaa77e08785bf635e699428f0
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 15:37:34 2016 +0200

    platform-specific target size for revisions cache

commit 817561b1c220a4bf82b5a554efd1b70980eaa406
Merge: cb4b9e7 750b562
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 15:30:06 2016 +0200

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

commit cb4b9e75ffac7f33041562c57e2a062ffc8f7aa0
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 13:58:53 2016 +0200

    fixed crash

commit c5dbd81bd6405bb4247d57fa6afdf39f48f0922c
Merge: 8dad7b3 ca102fc
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 13:55:07 2016 +0200

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

commit 8dad7b3de027a29acab9c97ec00a21baf8fb36d9
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 13:54:51 2016 +0200

    fix garbage collection

commit 8cac202eb8f2d05a42fc64922096e7e814de23a3
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:32:55 2016 +0200

    API cleanup

commit 728429981af90b9a0207646acd9b4e32fa78f7d3
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:22:47 2016 +0200

    make option hidden

commit c3fd3621d4f929c860a19ee99b523c71e5510b48
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:20:53 2016 +0200

    remove OtherEngine

commit dd069158ed9be8aca4d9221d38e16771f424081e
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:18:40 2016 +0200

    preparation for results aggregation

commit 983980afd2bdbc3602676b305dea3f816b12bd78
Merge: c46fd98 8a5bc21
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 15:23:16 2016 +0200

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

commit c46fd98516ba5674e0a3abad544c2b5cae7e340e
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 15:23:02 2016 +0200

    use own hash tables

commit 1e11621149dfd8d98cc78adcae9181778454abf1
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 11:15:37 2016 +0200

    fix another crash

commit 0bd000c880afa78d45b215adff7dcf055ee9eb8e
Merge: 7e5da3d 69e453a
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 11:12:54 2016 +0200

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

commit 7e5da3d08667823af80d75e0eaf7af41d8cebd4a
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 11:12:40 2016 +0200

    fix crash

commit d2c9ae228de019380091fdccafb50960d1ae17ac
Merge: a2571d5 2d4bcaf
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 10:47:49 2016 +0200

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

commit a2571d581cd3e52941846c4ce8f488b9220af0ea
Merge: d02b002 1f0ecf9
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 10:04:53 2016 +0200

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

commit d02b0026fa8cbcec0539985ba9f5fc5ca2eb1592
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 10:04:31 2016 +0200

    garbage collection

commit 04794a8b5cfea93f9d0e620119941753052609de
Merge: c38c2b7 454e0bf
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 17:38:06 2016 +0200

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

commit c38c2b74955b33046ecb1d459a98c76b7f908aa4
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 17:37:55 2016 +0200

    fix shutdown

commit 3d0f7d3daedd9332222648f8e096dd84d9eba142
Merge: 2bbe5a0 54a0d45
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 16:38:05 2016 +0200

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

commit 2bbe5a02aa2d9010056ec09bb526024fce9ed108
Merge: 8442ea6 0ea2ca2
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 16:35:29 2016 +0200

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

commit 8442ea63e5bc84705b844066e11dd4c334b0d796
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 15:00:35 2016 +0200

    read caching

commit 0cb85c8d9fb7092ad5365de69cc51b989ab84449
Merge: 5baa73d 44edc6c
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 26 12:52:39 2016 +0200

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

commit 5baa73d63eb9dd4a6b5168da636bd8b89958883a
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 26 12:43:39 2016 +0200

    preparation for read cache

commit 55445bfb85374fd1b88ebfc29151ac60e10d1d81
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 26 08:50:42 2016 +0200

    refactoring

commit f1cf513a8c1359a9e4e8f18b8a6af0c5440bc091
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 16:19:58 2016 +0200

    refactoring

commit 2ab07bb6efda66b22cff2b02b64e7d17157ea56f
Merge: aa8327c 1bdf414
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:51:11 2016 +0200

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

commit aa8327c151b7ae06046ad5ce95aed3d3e5c45a10
Merge: c55fd03 35e14fd
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:14:00 2016 +0200

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

commit c55fd031c612aee1479e361d51d92212a4e74d19
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:12:36 2016 +0200

    fix replication

commit 51164b4e70f6a6a16f841f369ecde1e906abb102
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:12:30 2016 +0200

    refactoring

commit 548c7f60dd14d834f796f7dde6d90feb9ba1be8e
Merge: 6be89c3 9b951ff
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 12:21:22 2016 +0200

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

commit 6be89c3013e5fb1eddf83befcdaf5d5ff935e9f1
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 12:20:52 2016 +0200

    allow storing arbitrary data elements in AssocUnique/AssocMulti

commit 73e5b06a050db6c3994abeba14675fe93e0c5b3b
Merge: ab5bb48 d9d0926
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 10:22:01 2016 +0200

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

commit ab5bb486bcb2e4eb8fb7267a68a7939c85e64f5b
Merge: 345963c a94db7d
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 20:50:59 2016 +0200

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

commit 345963cb6931fc7ce1f2714735f4bfbc60ca50e1
Merge: db3a071 d6a3b81
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 16:42:20 2016 +0200

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

commit db3a07134341156c1489399e33368858059094df
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 16:30:52 2016 +0200

    removed last occurrences of master pointers

commit 29222e71415120a9c7163cbc420414b93acad988
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 13:14:20 2016 +0200

    pass Transaction in API so we can make sure a transaction is ongoing

commit 78ba63060d1675eec6d35abe056d22c2cb6b91fb
Merge: 906dc42 560da96
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 13:00:52 2016 +0200

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

commit 906dc428ddf8ef079f7fa3664cb89df3fbf07c21
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 13:00:23 2016 +0200

    pass initialCount to physical

commit 46971f72b09dd2dbbd8e20fad7be138298ec0180
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 00:39:05 2016 +0200

    privatization

commit 7ec3508bb0be4b56de9fec42e1417000efe20ad7
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 00:37:17 2016 +0200

    move master pointer management into engine

commit 667fbef8ce5ec426e3a16a5ef377ff0e42b42444
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 00:18:50 2016 +0200

    index cleanup

commit 8fc5c764044438f2fc854f48c517a811e31f2df1
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 22:45:32 2016 +0200

    constexpressified basic VPackSlices

commit ae8bc45a3fb34cf8f9a39548e22039d505619038
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 21:51:55 2016 +0200

    renaming

commit ba1b68c468e20a3d5282a937efd8a2e063c1abac
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 21:38:05 2016 +0200

    move last master pointers into engine

commit 179741cd1711954f91d8ec53fad7221977c4bfc3
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 20:50:41 2016 +0200

    remove includes

commit ea4e5ac9d0c0479ccc34e91f7fdc08e605005681
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 18:06:54 2016 +0200

    removed TRI_doc_mptr_t

commit 40c7ce768898f0e4f09b133dedc335a65d1b0a21
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 16:43:44 2016 +0200

    removed more TRI_doc_mptr_t

commit 3450bcc042d4caf8499af3c5454e37b1eeaf8a28
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 16:43:23 2016 +0200

    removed more TRI_doc_mptr_t

commit 64e17c8744330d2835c39523c7b15f9b79c429ef
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 13:56:08 2016 +0200

    cleanup

commit 38feed51f15bdefa95e18dab0b694eccfe1d6a3b
Merge: dbbdeb4 ec15c72
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 11:03:08 2016 +0200

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

commit dbbdeb44f17f804fa798e2ee4d677543fec1b05b
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 11:02:45 2016 +0200

    make geo and fulltext index more robust given different platforms

commit c4e90fcf6a44390ecacacd6dbca3e5cf43179484
Merge: 86603e0 049471d
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 17:38:56 2016 +0200

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

commit 86603e04710170108d8ef4c023fa68f9366e628e
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 17:38:37 2016 +0200

    removed unused struct

commit 86b1b2568aefaba5ab7f621cb27b0ae5841b4da5
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 17:22:12 2016 +0200

    less TRI_doc_mptr_t

commit 30c3077002f23970e689ac422371b4e8054797db
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 16:49:09 2016 +0200

    less TRI_doc_mptr_t

commit ddb8ea6e958464f12a20a5d9e29772074dab22db
Merge: 14b9b5e d4d5e15
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:50:59 2016 +0200

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

commit 14b9b5e22030c98459b5b547cb0417a0be7970a2
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:49:44 2016 +0200

    remove mptr from method

commit cc0ed4046fcef91571f0b9b612fb290d2c19791f
Merge: 8b2b849 6fa99b6
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:27:30 2016 +0200

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

commit 8b2b849e8c256559fc579da74863b2005356481c
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:26:57 2016 +0200

    create separate mptrs on update/replace, and dont mess up the existing ones

commit 88b885e2aa36b33feb3983a4c822c593fcfbf165
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 13:11:38 2016 +0200

    cleanup

commit 851e62ef0697c60590da7f26524dd824192e6a78
Merge: 05f2fcf f510773
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 12:53:19 2016 +0200

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

commit 05f2fcf5ea52baf45aa8fff4624d9fe08fd9b4c7
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 12:53:11 2016 +0200

    a bit more cleanup

commit 4928db648984811c58cb3e33be672f9c46c79320
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 10:42:49 2016 +0200

    remove occurrences of TRI_doc_mptr_t

commit 8c1f0cbec38a4c62c1d481d291a7b913273f5271
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 09:13:17 2016 +0200

    partly move master pointers into engine

commit f80bf0c097f9439a8f3b3db8bac27d63086f4de9
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 19 15:43:26 2016 +0200

    refactoring

commit 407ddd508aa6016e99bf311df13c8aa0f8ae94c3
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 19 15:34:46 2016 +0200

    refactoring

commit a40c87ead0b6ad3cdccdc826ad178b25f5ea466e
Merge: df3ceea e245e15
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 19 09:11:48 2016 +0200

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

commit df3ceea699ab4f41501bb79eb206fa54bd502383
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 16 11:21:48 2016 +0200

    cleanup

commit e5ff73bf80c064a4c92372ea80c3a2351973df1c
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 16 10:37:17 2016 +0200

    cleanup

commit 44f42b25f09a2110b60d042635f8213242483f8f
Merge: 2bf7e33 fad7efe
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 16 10:00:38 2016 +0200

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

commit 2bf7e3373b0ad7e2a2fed7ccf883be05a51e4a22
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 17:21:51 2016 +0200

    unify index iterators a bit

commit e83455dece1bd014a126e9a5554f9a7c1fe4de3f
Merge: c83eab8 c912d96
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 14:07:52 2016 +0200

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

commit c83eab87106ca6f5123a4a4747a730deb71069eb
Merge: fb4c5c3 b9b7d8d
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 13:59:12 2016 +0200

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

commit fb4c5c3108af5ae8bd5bdd70748687e24b983b37
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 13:58:58 2016 +0200

    bugfixes

commit 7643365abca94aca5d138bd46341d086c1f0fb14
Merge: dabddf7 7e866a8
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 10:37:19 2016 +0200

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

commit dabddf728932cc00abc6052370cab9d081eb1025
Merge: 1662199 abb16ee
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 10:34:00 2016 +0200

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

commit 1662199d843256c0002c59c85b5f013306098cee
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 10:17:25 2016 +0200

    cleanup

commit 3ce9cf9de45f324af07112b2ac0c79ef22805cb1
Merge: e5d9703 135edf1
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 09:29:38 2016 +0200

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

commit e5d970356041123b92a6ee20e4e800175e04f548
Merge: cd2def8 542f4bb
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 08:44:46 2016 +0200

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

commit cd2def8762859d1cafbe066936a22a5ef27ae508
Merge: 9baaf4b a9cb076
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 08:20:43 2016 +0200

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

commit 9baaf4b32d6356d3defdfd8a4b1c0cf3f7ebfacf
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 08:20:24 2016 +0200

    intermediate commit. not working yet

commit 0ec0a7ce2598f4fb7a55880611947e12112e14b3
Merge: 66c6bbe 1a2a3ba
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 14 09:43:27 2016 +0200

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

commit 66c6bbe68fd20cfd9c2b8c00b2220294f29124ef
Merge: f5aadb1 b5ccbd1
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 17:02:46 2016 +0200

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

commit f5aadb1b82a85334b3a26b6fd6b9f00bebfa65f1
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 17:02:08 2016 +0200

    some index refactoring

commit 23e5db5bdb2a192cb4e7fe9b4572fb1e272c4a11
Merge: 25355ed 84fbc98
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 12:52:30 2016 +0200

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

commit 25355edc43111717de0d80101e56f44c99d84a56
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 12:52:19 2016 +0200

    removed dead code

commit 9dd274a1c1694c53987dc6d77526711b46ba996c
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 12 09:20:34 2016 +0200

    some refactoring

commit 049c11769dd38b7afac9cb85ef03ce617f96140f
Merge: ee75b21 a620690
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 12 08:43:12 2016 +0200

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

commit ee75b2169b533bafaac49752ca3b11b43940b928
Merge: 4f3a3ac 9539f2f
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 17:07:05 2016 +0200

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

commit 4f3a3ace83b301aa5e86e4b85b1b03f02f3dd0ea
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 17:06:46 2016 +0200

    refactoring

commit 190520d23d89c5435e4b5fce4ed7dd6dbdcc9d6c
Merge: eacd578 61c6e3b
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 16:34:00 2016 +0200

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

commit eacd578f1d837a622a69fdf1b7d0ca03fbe7d5bb
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 16:33:47 2016 +0200

    refactoring

commit 7dbac24e00e39943130cfcc3e8a9923fda15c663
Merge: 7a62bb8 2761b7d
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 15:20:49 2016 +0200

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

commit 7a62bb830749a661c189d96d6931ba3993bc00ee
Merge: 8d40248 4cebbf9
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 15:09:18 2016 +0200

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

commit 8d40248badbf0f11abbd67a21dc356bb6c5d7ee2
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 14:45:39 2016 +0200

    renaming

commit bedbe0f5105ba682552ad8192a6753ed68fe899d
Merge: c1321a3 1fcc5b1
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 13:57:59 2016 +0200

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

commit c1321a37e06fbf56e66456fb8341cce46bd2ae37
Merge: 13c14b9 884b6d5
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 13:53:51 2016 +0200

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

commit 13c14b96ac95331171013ca2283cb5c6923d7489
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 10:29:27 2016 +0200

    renamed

commit 60b8189cf9b045493fb863bc5988e55f865a6280
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:42:03 2016 +0200

    use algorithm::transform

commit 9019c3247db8b75340721d949754a90da648d511
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:41:37 2016 +0200

    get rid of free()

commit 2c6ab07b469d86297131d420c1a14a95771017b8
Merge: c49664d 331c4e3
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:30:21 2016 +0200

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

commit c49664d95b308c4b59b9ff07fe1f1d68f9742778
Merge: b42aaeb 01e445a
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:22:56 2016 +0200

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

commit b42aaeb3dfda6fce26eab0de47b617601a7cbfb6
Merge: 964fa6a 64da7d0
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 08:56:54 2016 +0200

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

commit 964fa6a2d656fed8bc89e4da445892df9d20046f
Merge: 24fd06e d7b4ad5
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 17:30:09 2016 +0200

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

commit 24fd06e5263d2b82e32f128270fc16af06839095
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 17:29:40 2016 +0200

    added initial cache

commit 6f092c2d8828b86627fbd80e67be8a5985bda88b
Merge: 2733228 df4dabc
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 15:48:33 2016 +0200

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

commit 2733228be753bc5425adca5963b865f7d5168a46
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 14:37:32 2016 +0200

    cleanup
 2016-10-24 10:18:30 +02:00
Frank Celler e4ba82e8e9 rewrite of AgencyComm 2016-10-23 00:46:30 +02:00
Max Neunhoeffer aee23cc9a5 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-10-21 15:43:38 +02:00
Max Neunhoeffer 5e743a2a69 Allow to specify good keys in smart vertex collections. 2016-10-21 15:42:25 +02:00
hkernbach 2a8ba62d2c grunt 2016-10-21 15:21:53 +02:00
hkernbach be442d38c7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-21 15:21:03 +02:00
Michael Hackstein e092c4a4b3 Fixed smartGraph frontend issues 2016-10-21 15:10:15 +02:00
hkernbach 7f11d016ea removed not needed icons 2016-10-21 14:53:40 +02:00
hkernbach cf0ffe53f9 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-21 13:22:18 +02:00
hkernbach b6e3cb75d2 bugfix force layout node positioning 2016-10-21 13:22:10 +02:00
Max Neunhoeffer 75ecf79277 Large scale inquisition of agency. 2016-10-21 10:34:46 +00:00
hkernbach d5ed52d4bb ui filter bugfix 2016-10-21 11:58: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
hkernbach fa12cb8ebd improved gv 2016-10-21 10:31:16 +02:00
hkernbach 8f5312f83e ui improved import feedback 2016-10-21 10:31:06 +02:00
Max Neunhoeffer 6d96e51883 Catch an exception in wait for sync replication. 2016-10-21 06:45:48 +00:00
Michael Hackstein dbeaeda1fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-20 18:13:19 +02:00
Michael Hackstein 319481dea7 Fixed babies and errors in AQL Modification cluster blocks. 2016-10-20 18:13:11 +02: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
Alan Plum c76af3012b
Replace service doc on update 2016-10-20 15:05:23 +02:00
Alan Plum c7940bdb42
More readable names 2016-10-20 15:04:45 +02:00
Alan Plum f271774e59
Fix manifest license SPDX format 2016-10-20 15:04:09 +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
hkernbach 0a349d0816 aql editor graph preview bugfix 2016-10-20 12:51:55 +02:00
hkernbach 6a3857688a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-20 12:23:01 +02:00
hkernbach dc9c244b10 ui version 2016-10-20 12:22:55 +02:00
jsteemann 5730d0bdc4 fixed jslint 2016-10-20 11:34:18 +02:00
hkernbach 327b5e7022 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-20 08:26:58 +02:00
Andreas Streichardt e2fc190e1b No ipv6 on travis..fail 2016-10-19 17:45:37 +02:00
hkernbach 0345c24006 scss 2016-10-19 17:03:56 +02:00
Andreas Streichardt 954e02ef24 Implement endpoint test...proper socket cleanup 2016-10-19 16:22:36 +02:00
hkernbach 25ef505c75 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-19 16:10:47 +02:00
hkernbach 092356d058 improved gv 2016-10-19 16:10:36 +02:00
Michael Hackstein 4fac851560 Added some better handling of SmartEdgeCollections in simpleQueries. 2016-10-19 15:19:33 +02:00
hkernbach f09482b505 gv 2016-10-19 12:32:10 +02:00
hkernbach 494cf75cc6 gv bugfix 2016-10-19 10:10:44 +02:00
hkernbach cd3a5b4e45 ui fixed cached query restore 2016-10-19 08:47:36 +02:00
hkernbach e181457fac issue: #2112 2016-10-18 17:44:38 +02:00
Frank Celler 11055082ea Make --verbose true work in testing.js for cluster. 2016-10-18 13:32:12 +00:00
hkernbach 6bc276ed41 grunt 2016-10-18 14:25:17 +02:00
hkernbach d6bfee26cd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-18 14:23:52 +02:00
hkernbach 90c2025957 ui graph management bugfix 2016-10-18 14:23:39 +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
hkernbach abbd47099f ui version 2016-10-18 10:49:02 +02:00
Simran Brucherseifer 7a5b653599 logo: make edition more subtle 2016-10-17 18:00:07 +02:00
Simran Brucherseifer c6716cf5ba Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-10-17 16:48:06 +02:00
hkernbach 7b5e53ad3b logo 2016-10-17 16:10:21 +02:00
hkernbach d26c361db7 grunt 2016-10-17 16:06:56 +02:00
hkernbach b8d35c131c login view 2016-10-17 16:02:42 +02:00
hkernbach 450aac6e05 grunt 2016-10-17 15:57:44 +02:00
hkernbach 0aba389179 ui graphs 2016-10-17 15:56:41 +02:00
hkernbach a962809687 logos 2016-10-17 15:56:26 +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
hkernbach 0fddf50040 grunt 2016-10-17 12:46:34 +02:00
hkernbach e730118074 ui smart graph 2016-10-17 11:56:21 +02:00
hkernbach 5d554f9bf3 ui edition mechanism 2016-10-17 11:55:34 +02:00
Max Neunhoeffer c9cf9a60c8 Put some debug messages in log level debug. 2016-10-14 18:48:11 +02:00
hkernbach df391b242b ui graphs 2016-10-14 17:29:18 +02:00
hkernbach 6002682eb2 grunt build 2016-10-14 17:02:28 +02:00
hkernbach 841ba88fdd scss 2016-10-14 16:59:31 +02:00
hkernbach 23720b3363 gv improvement 2016-10-14 16:59:17 +02:00
hkernbach fc6c42f27a gv improvement 2016-10-14 16:59:01 +02:00
hkernbach fa802beda7 ui state 2016-10-14 16:58:40 +02:00