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

221 Commits

Author SHA1 Message Date
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
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Michael Hackstein 3434be7b7a Implemented documents baby variant for cluster and also improved the baby tests. ALl errors will now have exactly one representation for each baby document even if they could be identified earlier. 2016-04-14 17:40:28 +02:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Frank Celler af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
Jan Steemann 2986ec2a64 removed dead code 2016-03-23 20:08:22 +01:00
jsteemann 5ded90ed1c fixed compare function for Custom attributes 2016-03-18 13:55:36 +01:00
Max Neunhoeffer 827f2f4f44 Improve /_api/simple/remove-by-key. 
Fix more document methods.
 2016-03-17 18:49:52 +01:00
Max Neunhoeffer 2c81e5cac9 Fix V8 behaviour for documents. 2016-03-17 15:53:14 +01:00
Max Neunhoeffer 138ed35012 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 00:29:05 +01:00
Max Neunhoeffer 61bf275b85 Add some options to usage message. 2016-03-17 00:28:53 +01:00
jsteemann 3cd107e761 removed includes 2016-03-17 00:11:07 +01:00
Max Neunhoeffer 8c2545bf66 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 00:06:55 +01:00
jsteemann 97f6f87b01 removed unused files 2016-03-17 00:06:11 +01:00
Max Neunhoeffer 3f648ef2bb Fix remove behaviour. 2016-03-17 00:05:51 +01:00
Max Neunhoeffer 8b8019b28a Fix behaviour of remove. 2016-03-16 19:55:49 +01:00
jsteemann 8650404c9e fixed startup 2016-03-15 20:09:15 +01:00
jsteemann a84c46d62b some optimizations for V8<->vpack conversion 2016-03-14 21:50:16 +01:00
jsteemann 358b09260e fixed prologue marker writing 2016-03-14 17:54:46 +01:00
Max Neunhoeffer 8f6cd501aa Change behaviour of remove(), return data, allow returnOld. 2016-03-11 16:35:55 +01:00
Max Neunhoeffer 1c94f8d1be returnNew and returnOld, progress. 2016-03-11 15:12:58 +01:00
Max Neunhoeffer e77159b008 New returnNew option for insert. 2016-03-11 12:44:36 +01:00
Max Neunhoeffer 9e98cc7107 Fix a bug in babies API for documents. 2016-03-10 16:28:27 +01:00
jsteemann a7450eb65f removed some includes 2016-03-09 22:21:08 +01:00
Max Neunhoeffer a2d0e709dc Babies for <collection>.remove 2016-03-09 09:59:36 +01:00
Max Neunhoeffer d39ced89b2 Babies for <collection>.document(). 2016-03-09 09:39:59 +01:00
Max Neunhoeffer be9bf2d90f Babies for document and remove, various cleanup. 2016-03-08 21:30:19 +01:00
Max Neunhoeffer 2ae400fa06 Adjust behaviour of replace and update to tests. 2016-03-08 18:45:52 +01:00
Max Neunhoeffer 4351089a48 Fix behaviour of V8 replace and update. 2016-03-08 17:44:33 +01:00
Max Neunhoeffer a9be9b4fdb Put in tests to check for existence of _from and _to in edges. 2016-03-08 11:20:52 +01:00
Jan Steemann fc44d4af6f allow creating edges 2016-03-07 21:05:35 +01:00
Jan Steemann 0c6e8bcd98 fixed replace 2016-03-07 16:49:26 +01:00
Max Neunhoeffer b2a70a09b3 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-07 16:27:23 +01:00
Max Neunhoeffer e3a5a7838e Fix option handling. 2016-03-07 16:27:14 +01:00
Jan Steemann b358fa329d fixed replication dump and logger-follow commands 2016-03-07 15:21:11 +01:00
Jan Steemann 1c150d4d6e Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-04 18:35:40 +01:00
Jan Steemann ad4a9542ea removed file 2016-03-04 18:32:54 +01:00
Jan Steemann c157363f3c less dependencies 2016-03-04 17:21:09 +01:00
Max Neunhoeffer 4cb42662f3 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-04 15:19:26 +01:00
Max Neunhoeffer e4ce808349 Finish revolution of document API, RestHandler still missing. 2016-03-04 15:16:23 +01:00
Max Neunhoeffer 2654e654db Compiles again, document API not yet sorted out. 2016-03-04 10:32:34 +01:00
jsteemann cf1427adff smaller datafile markers 2016-03-04 02:25:03 +01:00
Jan Steemann 78f07c6a31 less json 2016-03-03 14:23:39 +01:00
Max Neunhoeffer d2d785ec41 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-03 09:04:54 +01:00
Jan Steemann 4c03f4bf8d simplification 2016-03-02 15:50:52 +01:00
Max Neunhoeffer 0f883dc0c8 Adjust replace to new TRI_V8ToVPack. 2016-03-02 10:53:06 +01:00
Max Neunhoeffer 848860de45 Fix some bugs in replace. 2016-03-01 18:16:26 +01:00