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

797 Commits

Author SHA1 Message Date
jsteemann ac58b181bd fix recovery test for mmfiles engine 2017-04-18 22:20:18 +02:00
Simon Grätzer bab71f6339 Fixing jslint errors 2017-04-18 12:15:26 +02:00
Simon Grätzer e0e00b0b6b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBEdgeIndex.cpp
 2017-04-13 17:48:52 +02:00
Simon Grätzer 866d8b7451 Fixing tests 2017-04-13 17:45:16 +02:00
Kaveh Vahedipour 001c2b4092 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-11 11:46:40 +02:00
Kaveh Vahedipour 28fbf8ec12 sensitivityEstimates do not belong in Current 2017-04-11 11:46:20 +02:00
Max Neunhoeffer 53b3a73486 Add a timeout option to <collection>.drop(). 
This is in particular used to allow the Schmutz to make progress
in the case of a long running transaction.
 2017-04-07 15:52:19 +02:00
jsteemann 8206afa0b1 re-enable index 2017-04-04 11:47:34 +02:00
jsteemann d563eb432f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-30 15:50:53 +02:00
Alan Plum 373eade2f9
Let ArangoDB handle the allow-credentials header 2017-03-30 13:08:37 +02:00
jsteemann 3ff4f15a19 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 17:50:55 +02:00
mpv1989 59e000b743 Foxx: Fix CORS blowing up when headers are not set 2017-03-29 13:43:06 +02:00
jsteemann dcfd60f98c disable skiplist index for now 2017-03-29 12:37:44 +02:00
mpv1989 f3ebf247b0 automatically add CORS response headers 2017-03-28 19:48:46 +02:00
Wilfried Goesgens 85f58b9a21 we may now also do 'milestone'-releases next to devel/alpha/beta/rc 2017-03-22 11:59:25 +01:00
jsteemann 25a380f77c Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 12:50:11 +01:00
Max Neunhoeffer 4017bfb296 Revise /_api/cluster/endpoints API and Documentation. 2017-03-16 11:33:46 +01:00
Alan Plum 4920ef8b41
Implement tap/xunit reporters in Foxx 2017-03-15 20:09:31 +01:00
Alan Plum c919cb7be8
Add Foxx res.type helper 2017-03-15 20:09:27 +01:00
Simon Grätzer 1c5c616875 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-15 14:12:18 +01:00
jsteemann 9a88c8c226 fix a memleak 2017-03-15 14:05:13 +01:00
Max Neunhoeffer c8a205b1aa New /_api/cluster/endpoints. 
Also fix documentation (and deprecate) /_api/endpoint.
 2017-03-15 13:33:50 +01:00
jsteemann 1a06f1e15e initial functionality for views - unstable 2017-03-14 16:35:45 +01:00
Simon Grätzer 67066c64ad Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-08 18:20:44 +01:00
jsteemann 3ed19e291d added "shardIds" option for AQL queries to restrict queries to specific shards 2017-03-08 15:07:10 +01:00
Simon Grätzer c0a390aefe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-06 15:53:43 +01:00
Frank Celler ab49f6c1b4 fixed variables parsing in GraphQL 2017-03-05 23:31:38 +01:00
Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangosh/Import/ImportHelper.cpp
 2017-03-04 02:08:27 +01:00
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