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

310 Commits

Author SHA1 Message Date
Andreas Streichardt ef06a12e5d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 17:40:54 +02:00
Andreas Streichardt 24afe7a6ac Finally implement proper agent notification 2016-04-21 17:01:31 +02:00
Kaveh Vahedipour 307e4a31a0 class Node out of Store.{h,cpp} 2016-04-21 13:55:28 +02:00
Kaveh Vahedipour 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00: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
Kaveh Vahedipour 114b643d6e cluster startup and supervision 2016-04-18 16:13:30 +02:00
Kaveh Vahedipour 1221326753 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 13:08:56 +02:00
Kaveh Vahedipour 76a0b2d41a cluster startup and supervision 2016-04-18 13:08:49 +02:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Michael Hackstein 2d860fb80e Added a cpp file for AqlTransaction. Now only parts of AQL have to be rebuild on cluster changes, not complete AQL 2016-04-14 11:30:54 +02:00
Frank Celler 0fa6435731 WIP 2016-04-13 21:12:16 +02:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Frank Celler 3f9dd62d4c WIP 2016-04-13 12:30:18 +02:00
Frank Celler dc3e8e6bdb WIP 2016-04-12 20:27:46 +02:00
Kaveh Vahedipour 66636cdb7d introducing cluster sanity checking to agency 2016-04-12 11:35:27 +02:00
Frank Celler 922753ef3d WIP 2016-04-11 17:44:41 +02:00
Kaveh Vahedipour 1c64dfccb6 clang binaries don't like being left with an undefined iterator. no way around fixing it. 2016-04-11 14:36:42 +02:00
Frank Celler 3d2cc31306 WIP 2016-04-11 00:05:37 +02:00
Frank Celler d24f63e8e2 added upgrade feature 2016-04-08 15:39:36 +02:00
Frank Celler 58b9cf7e91 WIP 2016-04-07 15:40:11 +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 873f226b5f added SchedulerFeature 2016-04-01 12:52:28 +02:00
Frank Celler af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
Jan Steemann dce7c427d9 test fixes 2016-03-24 14:55:31 +01:00
Jan Steemann 9ac39b7ad6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:30 +01:00
Jan Steemann ce63219435 removed DocumentAccessor 2016-03-21 15:40:44 +01:00
Jan Steemann f458acc4c7 cleanup 2016-03-21 14:35:58 +01:00
jsteemann a15e9d9550 removed files 2016-03-17 00:28:08 +01:00
jsteemann 97f6f87b01 removed unused files 2016-03-17 00:06:11 +01:00
jsteemann 873854a0a0 removed unused file 2016-03-16 23:56:52 +01:00
jsteemann 1a9d46ad31 removed wrapper for ShapedJson 2016-03-14 14:33:32 +01:00
Max Neunhoeffer 9dbe9acf5f Lose MasterPointer.cpp (all header now). 2016-03-11 08:43:58 +01:00
Kaveh Vahedipour 61a55d61db Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-10 17:37:43 +01:00
Max Neunhoeffer 70772d6174 Remove RestEdgeHandler, start API-Changes-3.0.md Dokument. 2016-03-10 11:28:26 +01:00
jsteemann cf3b00adc2 removed unused functionality 2016-03-09 23:14:29 +01:00
Jan Steemann 878865c53a Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 17:57:07 +01:00
Kaveh Vahedipour 3a239fe1d5 Store intestinals into cpp file. Write to db ok. 2016-03-09 09:58:43 +01:00
Frank Celler 5e027818c5 fixed dependencies in case USE_PRECOMPILED_V8 2016-03-09 09:44:57 +01:00
Jan Steemann 0c2fdb9fb9 less dependency on document-collection.h 2016-03-04 20:53:17 +01:00
Jan Steemann 0277ebe5a6 moved TRI_doc_mptr_t into its own file(s) 2016-03-04 20:02:55 +01:00
Jan Steemann 4de5e41044 simplifications 2016-03-04 17:48:27 +01:00
Kaveh Vahedipour 2046a704e0 notifyall 2016-03-03 14:24:23 +01:00
Jan Steemann 92493f2807 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:04:58 +01:00
Frank Celler c88a68358d CMAKE changes for Windows and Solaris 2016-03-01 17:31:30 +01:00
Kaveh Vahedipour fa66ba2ffc compiles again 2016-03-01 16:45:34 +01:00
Michael Hackstein a424876d00 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-01 13:39:57 +01:00
Michael Hackstein fa8b4ae0e3 Removed Velocypack from FulltextIndex. And replaced TRI_string_vector_t with std::vector<std::string> 2016-03-01 13:35:47 +01:00
Jan Steemann 15350cf4b8 renamed and removed 2016-03-01 12:34:03 +01:00