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

393 Commits

Author SHA1 Message Date
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Jan Steemann be2ec7b9fc don't access allocatorThread when it's already destroyed 2016-04-19 16:08:32 +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
Jan Steemann aaf6176347 remove useless checks 2016-04-18 18:11:28 +02:00
Frank Celler 17cd890132 WIP 2016-04-16 20:29:33 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
jsteemann 4a7c9f0f68 simplified bloated comments 2016-04-09 11:27:30 +02:00
jsteemann e005faf197 obvious bug... 2016-04-09 00:22:42 +02:00
jsteemann 163a61f17b prevent races on shutdown 2016-04-09 00:18:41 +02:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Jan Steemann 591851f9ac ported bugfix from 2.8 2016-04-07 13:07:47 +02:00
Jan Steemann 513dc26fc1 make replication tests more deterministic 2016-04-07 13:00:30 +02:00
Frank Celler 5cab4cffac WIP 2016-04-04 15:23:25 +02:00
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Frank Celler af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
Michael Hackstein c0173d7d67 Fixed unused variable warning when compiling without maintainer mode 2016-03-24 13:40:43 +01:00
jsteemann b7c1a42f96 test fixes 2016-03-24 01:12:57 +01:00
jsteemann 9fcc5d043b removed superfluous includes 2016-03-21 22:58:42 +01:00
jsteemann b2d7038b30 fixed some datafile issues 2016-03-15 23:37:39 +01:00
jsteemann 2ade0ef3d0 fixed log output 2016-03-14 18:05:20 +01:00
jsteemann 358b09260e fixed prologue marker writing 2016-03-14 17:54:46 +01:00
Jan Steemann beb132b466 AqlValue refactoring 2016-03-10 18:24:12 +01:00
Max Neunhoeffer f25c5175ac Kill further uses of update_policy. 2016-03-10 00:07:51 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
jsteemann d756f6a176 removed TRI_transaction_collection_t from public APIs 2016-03-09 01:51:17 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann b358fa329d fixed replication dump and logger-follow commands 2016-03-07 15:21:11 +01:00
Jan Steemann 6eea757c01 simplifications 2016-03-04 19:40:24 +01:00
Jan Steemann 05f98cbd72 fixed compile errors 2016-03-04 18:43:51 +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
Jan Steemann 5ef3581d16 simplifications 2016-03-04 14:52:43 +01:00
Jan Steemann a1c758b615 deleted some marker types 2016-03-04 13:17:32 +01:00
Jan Steemann eb82d96836 constexpr 2016-03-04 12:33:59 +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
Jan Steemann 298c96f2cc store information about datafile in upper bit 2016-03-01 16:29:09 +01:00
Jan Steemann 0cb0c0142f remove _rid from master pointer 2016-03-01 15:06:54 +01:00
Jan Steemann 0fcaf41477 cleanup 2016-03-01 14:07:47 +01:00
Jan Steemann 15350cf4b8 renamed and removed 2016-03-01 12:34:03 +01:00
jsteemann 1595566af6 removed a few marker types 2016-02-29 23:55:38 +01:00
jsteemann adae2e7c67 fixed saving 2016-02-29 23:31:21 +01:00
Jan Steemann eae225f4c8 changed marker storage 2016-02-29 18:33:16 +01:00
Jan Steemann 254f6b49b9 write prologue markers for document & remove markers 2016-02-29 17:08:38 +01:00
Jan Steemann 18c6fb35e1 removed warning 2016-02-29 15:23:25 +01:00
Jan Steemann f4f7bcb044 recovery 2016-02-29 14:24:46 +01:00