1
0
Fork 0
Commit Graph

728 Commits

Author SHA1 Message Date
Kaveh Vahedipour 7b440f94dc Moving Job classes out of Supervision 2016-05-31 16:28:54 +02:00
jsteemann 3b318805ec don't leak buffers 2016-05-19 18:15:08 +02:00
Max Neunhoeffer a73b348e77 Add TRI_SuspendExternalProcess and TRI_ContinueExternalProcess for Unix. 2016-05-19 14:06:57 +02:00
Andreas Streichardt aba66a50eb _listEndpoints => _endpoints() 2016-05-18 15:34:42 +02:00
Kaveh Vahedipour e623198d6c Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 17:06:23 +02:00
jsteemann f2d014ff6a bugfixes 2016-05-04 16:10:04 +02:00
Andreas Streichardt f5f040e21a Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-03 15:47:00 +02:00
Alan Plum 85950c9798
Remove monkeypatches.js 2016-05-03 14:55:32 +02:00
Alan Plum c1828234d6
Move shallowCopy and propertyKeys into @arangodb/util 2016-05-03 14:55:32 +02:00
Alan Plum 3fb6d517f7
Object#propertyKeys -> internal.propertyKeys 2016-05-02 17:34:08 +02:00
Alan Plum 571e07c613
Missed one 2016-05-02 17:23:51 +02:00
Alan Plum 4af0c67c5c
Unbreak shallowCopy 2016-05-02 17:19:01 +02:00
Alan Plum 2bd0f59d9d
Bump jshint to 2.9.2 2016-05-02 14:42:09 +02:00
jsteemann 285da023e5 ShapedJson removal 2016-04-27 00:45:15 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Jan Steemann 54df0ecb5b fixed statistics 2016-04-19 18:11: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 c39eca49e4
Add require.aliases 2016-04-18 18:01:06 +02:00
Alan Plum 6fc9b185eb
hasOwnProperty is now global 2016-04-18 18:00:41 +02:00
Alan Plum 95613be7c6
Mark ArangoDB result sets and errors
This makes it easier to recognize them (see joi.isJoi).
2016-04-18 18:00:29 +02:00
Alan Plum 5161c63670
Remove magical Foxx comments 2016-04-18 18:00:18 +02:00
Alan Plum 4140c26d30
Use symbols for internal module props 2016-04-18 18:00:17 +02:00
Alan Plum c7688a72f8
module.requireCache -> module.require.cache 2016-04-18 18:00:17 +02:00
Alan Plum eacf570a39
applicationContext -> module.context 2016-04-18 18:00:17 +02:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Jan Steemann 6df7221691 cleanup 2016-04-07 17:08:44 +02:00
Frank Celler 58b9cf7e91 WIP 2016-04-07 15:40:11 +02:00
Max Neunhoeffer b1963d2cee Fix replication in the sense that revs are now copied over. 2016-04-05 10:27:43 +02:00
Jan Steemann cda0646c83 removed unused error codes 2016-03-24 17:04:58 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Andreas Streichardt 8cdf8eebad More python fixes 2016-03-23 18:36:22 +01:00
Jan Steemann 45cc15fe45 fixes 2016-03-22 10:51:42 +01:00
jsteemann f12320277f bugfixes 2016-03-18 16:56:05 +01:00
jsteemann e0ce1cef5a make buffers somewhat usable 2016-03-17 22:47:22 +01:00
Frank Celler 13603e876e safety check 2016-03-17 12:00:27 +01:00
Alan Plum 041ebf1542 Fix #1577 once and for all
This guarantees the module resolution doesn't break out of the ArangoDB module root (or the service's root).
2016-02-26 12:24:26 +01:00
Michael Hackstein 8295bae5b3 Added generated files 2016-02-16 14:07:10 +01:00
Alan Plum 6593f3d358 Clean up stacktraces
Fixes #1564, #1565, #1744.
2016-02-15 22:56:29 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Frank Celler 6d4b68245a added print.limitString 2016-02-06 20:20:07 +01:00
Frank Celler 7769b68d69 fixed returns 2016-02-04 16:46:29 +01:00
Frank Celler 8b6f4b8bec removed DEV_APP_PATH 2016-02-04 16:38:20 +01:00
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Max Neunhoeffer 93400bfdcc Implement followerInfo. 2016-02-01 11:38:10 +01:00
Michael Hackstein 651e705ebd Introduced a new EMPTY_GRAPH error which is thrown during AQL execitions whenever the graph has no edge collections. 2016-01-28 18:07:26 +01:00
Frank Celler 8a7f409380 added fs.append 2016-01-24 11:34:13 +01:00