1
0
Fork 0
Commit Graph

4239 Commits

Author SHA1 Message Date
jsteemann 6ac4c809ee do not create markers on the heap, but create them in the WAL space directly 2016-04-29 01:01:10 +02:00
Jan Steemann cdc9b8e774 re-active test 2016-04-28 13:47:28 +02:00
jsteemann cd45a52ba5 attempt to finish startup order 2016-04-27 22:54:29 +02:00
jsteemann 285da023e5 ShapedJson removal 2016-04-27 00:45:15 +02:00
Michael Hackstein c1191d4268 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-26 14:50:28 +02:00
jsteemann d21cdb50ad speed up transactions 2016-04-26 11:58:10 +02:00
Michael Hackstein bd302a023c Reduced the nesting level of arrays in AQL test. Icannot be executed on MacOs and asan 2016-04-26 11:50:19 +02:00
jsteemann 021183f14e added tests 2016-04-26 10:23:47 +02:00
Alan Plum 7b9085b009
Clear+recreate internal sessions to refresh them 2016-04-25 14:22:10 +02:00
jsteemann fe42176772 make system collections a bit smaller 2016-04-24 16:34:40 +02:00
jsteemann f4fb6f0dcd fixed arango-dfdb 2016-04-24 16:19:56 +02:00
jsteemann 58198a834e re-added options for foxx queues 2016-04-24 15:27:08 +02:00
Alan Plum 7653fe5eb8
Re-createSid on every access
There's no other way to prevent the internal sid from timing out apparently.
2016-04-21 15:14:01 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Jan Steemann 5027d7fe1f documentation for LIKE 2016-04-21 12:46:42 +02:00
Alan Plum 996c4568fb
Fix shell-foxx-swager-spec.js 2016-04-21 10:10:11 +02:00
Max Neunhoeffer 646165f827 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-20 22:38:11 +02:00
Simran Brucherseifer a5ad9f33a9 Minor corrections
Excluded Aardvark, the graph viewer in particular
2016-04-20 22:09:00 +02:00
Alan Plum e7e457b560
ES6ify 2016-04-20 18:34:46 +02:00
Alan Plum a3d5c64532
Object.extend is not a function 2016-04-20 18:13:04 +02:00
Alan Plum 0529471cdc
Allow passing an error to res.throw as reason 2016-04-20 18:11:49 +02:00
Max Neunhoeffer 13fdd67d38 Better timeouts in synchronisation in heartbeat thread. 2016-04-20 17:24:38 +02:00
Alan Plum 96aa1d9129
Add req.json 2016-04-20 17:18:51 +02:00
Alan Plum 7065d29975
Don't add default bodies 2016-04-20 17:18:51 +02:00
Alan Plum 2b0c1f6f9a
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 0fff3e661f
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 249dddcdf4
Optionally auto-update collection sessions 2016-04-20 15:23:02 +02:00
Alan Plum e7c0a49cfb
Don't use session.userData in system, always update lastAccess 2016-04-20 15:23:01 +02:00
Alan Plum 50ae4804f6
Spacing 2016-04-20 15:23:00 +02:00
Kaveh Vahedipour d53e47c7d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-20 11:23:10 +00:00
Alan Plum 8b7a98f2e8
global.aqlQuery -> arangodb.aql 2016-04-20 13:05:27 +02:00
jsteemann 9d258f47e0 added test case 2016-04-20 12:26:07 +02:00
jsteemann e390da31c1 speed up test 2016-04-20 10:27:06 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Alan Plum 2d44ff2839
Patch Swagger-UI to fix param.type undefined error
See https://github.com/swagger-api/swagger-ui/issues/2004
2016-04-19 18:39:22 +02:00
Alan Plum 494d5d5855
Foxx.getExports -> legacy 2016-04-19 18:16:18 +02:00
Alan Plum 17854b57a8
Formatting 2016-04-19 18:16:18 +02:00
Alan Plum 7b76519bbe
Allow res.throw(status, args) 2016-04-19 18:16:18 +02:00
Alan Plum 8a114a58d3
queues.js -> queues/index.js 2016-04-19 18:16:18 +02:00
Jan Steemann 2254df14f0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 15:38:37 +02:00
Jan Steemann 2533affb02 fixed crash 2016-04-19 15:38:30 +02:00
Alan Plum 4c3319de25
Extract session storage.save
Also fix transports
2016-04-19 15:06:55 +02:00
Kaveh Vahedipour 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00:00
Alan Plum ffcbd0a69e
Fix require tests 2016-04-19 09:29:24 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
Alan Plum 051a153252
@arangodb/foxx -> @arangodb/foxx/legacy 2016-04-18 18:01:08 +02:00
Alan Plum c55eeac990
Fix FM nightly test 2016-04-18 18:01:07 +02:00
Alan Plum c39eca49e4
Add require.aliases 2016-04-18 18:01:06 +02:00
Alan Plum 9f25f44a87
Don't check the Foxx store unless you actually need it 2016-04-18 18:01:06 +02:00
Alan Plum 777848472d
standalone.html -> index.html 2016-04-18 18:01:05 +02:00