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

770 Commits

Author SHA1 Message Date
Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangosh/Import/ImportHelper.cpp
 2017-03-04 02:08:27 +01:00
jsteemann 573c346fa5 attempt to fix issues reported by @ewoutp 2017-03-03 14:47:21 +01:00
jsteemann d369c698b5 fixed issue #2346 2017-03-03 10:10:38 +01:00
Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	3rdParty/V8/v8
#	arangod/Transaction/Methods.h
#	arangod/Utils/UserTransaction.h
#	arangod/V8Server/v8-collection.cpp
 2017-03-01 14:52:35 +01:00
Alan Plum 705273bdab
Allow passing own graphql-sync module to Foxx 2017-02-28 14:47:17 +01:00
Alan Plum 90c538b7a4
Not undefined 
[skip ci]
 2017-02-15 18:32:56 +01:00
Alan Plum 622b4fac4b
JWT uses seconds 
Fixes #2249.
 2017-02-14 19:20:41 +01:00
Alan Plum 7471f94fa7
Linting 2017-02-14 19:20:41 +01:00
Alan Plum 5a02a8983f
More cookie options 
Fixes #2085.
 2017-02-14 19:20:40 +01:00
Alan Plum 022ff11886
REALLY fix routing tests 2017-02-14 17:18:40 +01:00
Alan Plum 01f83c20a2
Really fix routing 2017-02-14 17:15:44 +01:00
Alan Plum d72be1cf74
Fix routing 2017-02-14 17:15:06 +01:00
Alan Plum 0f4b932717
Fix Foxx routing 2017-02-14 16:36:40 +01:00
Alan Plum 2eb8f30c7f
Spring cleaning 
Also removed actions.rewriteRouting as it is not actually used anywhere.
 2017-02-14 16:36:40 +01:00
jsteemann 238070b477 fixed code of some examples 2017-02-13 08:21:28 +01:00
Andreas Streichardt 39436dac89 Finally remove lock methods 2017-02-10 19:47:31 +01:00
Andreas Streichardt 488b71cf54 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-10 19:40:51 +01:00
Andreas Streichardt bc1df86ddd remove lock queries 2017-02-10 19:34:29 +01:00
Simon Grätzer edab268572 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Aql/FunctionDefinitions.cpp
#	arangod/Aql/Functions.h
#	arangod/Utils/ExplicitTransaction.h
 2017-02-10 15:21:24 +01:00
Max Neunhoeffer f72af6a06a Increase timeout for waiting for sync repl to settle. 
This is mainly for the case of the parallel unittests, where the heavy
load leads to delays.
 2017-02-09 22:06:39 +01:00
Michael Hackstein d47298d518 Removed JS_NEAR, JS_FULLTEXT, JS_WITHIN entirely. They have been replaced by simple queries 2017-02-08 12:54:10 +01:00
Simon Grätzer 9b9f91a81c Pegel: Adding support for "PREGEL_RESULT" in aql 2017-02-07 18:37:23 +01:00
Max Neunhoeffer ed0d5be0a6 If initial database is gone, use system database. 2017-02-06 09:47:19 +01:00
Max Neunhoeffer 20e2128a44 Fix shardDistribution in case of leader change. 2017-02-06 09:45:00 +01:00
Max Neunhoeffer 72fa45cc94 Port better reporting of longish Schmutz behaviour to devel. 2017-02-03 10:47:13 +01:00
Max Neunhoeffer 7c0575b27d Fix timeout in cluster operation and wal flush bugs. 2017-02-03 10:42:06 +01:00
jsteemann 7556386202 fixed tests 2017-02-02 08:39:50 +01:00
Max Neunhoeffer 105389702a Lower log level of sync replication events. 2017-02-01 16:04:04 +01:00
Max Neunhoeffer a5b4eb3c3d Lower log level for local shard operations to debug. 2017-01-31 09:31:52 +01:00
Max Neunhoeffer f09ecd21b2 Logging level for background job debugging down to DEBUG. 2017-01-29 23:05:33 +01:00
Max Neunhoeffer 6993ca32c7 Add more debugging output on log level info around Schmutz script. 2017-01-28 20:28:58 +01:00
Alan Plum cbb77cf591
Only show codeFrames for swagger errors in dev mode 2017-01-27 02:03:51 +01:00
Alan Plum 3370ecbadd
Nicer error page and code frames 2017-01-27 01:57:30 +01:00
Alan Plum c268b2db91
Keep stacktraces out of error messages 
They are already reported much more consistently via 'cause' so methods logging them should exploit that instead.
 2017-01-27 01:57:29 +01:00
Andreas Streichardt 2476cf7146 Fix drop and add reporting in agency current 2017-01-26 14:00:56 +01:00
Andreas Streichardt 0365b3eb49 Fix index error reporting and add test for it 2017-01-26 12:15:42 +01:00
Max Neunhoeffer 1468628e58 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-01-26 10:47:26 +01:00
Max Neunhoeffer fe1b10e6af Fix waitForSyncRepl. 2017-01-26 10:47:03 +01:00
Andreas Streichardt 4e6371630a Fix reporting index and collection errors 2017-01-26 10:44:15 +01:00
Andreas Streichardt cffc981cf9 Fix jslint 2017-01-25 12:42:30 +01:00
Andreas Streichardt cca8fbc6b3 Less log spam... 2017-01-25 12:41:30 +01:00
Andreas Streichardt af8331119b Do not spam useless log messages 2017-01-25 12:31:53 +01:00
Max Neunhoeffer f913b10d22 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-01-25 11:37:37 +01:00
Max Neunhoeffer aaa2738b57 Log level for dropping local shard back to debug. 2017-01-25 11:36:50 +01:00
Andreas Streichardt acbb892612 Classic...fix unittest..fail real system 2017-01-24 19:07:34 +01:00
Andreas Streichardt d91a6af1a7 Remove singletransaction and fetch collection from vocbase directly 2017-01-24 18:51:05 +01:00
Andreas Streichardt d3642f1487 First update current tests 2017-01-24 18:35:26 +01:00
Andreas Streichardt ea220a22cc Make updatecurrentcollection better testable 2017-01-24 16:51:12 +01:00
Max Neunhoeffer 5e6d2c2045 Fix acquire of read locks for sync. replication. 2017-01-24 13:55:56 +01:00
Max Neunhoeffer 539ae7275e Improve formatting. 2017-01-24 13:29:05 +01:00