Max Neunhoeffer 3ed256a478 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk		2016-03-10 11:25:20 +01:00
..
Actions	Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk	2016-03-09 09:42:10 +01:00
ApplicationServer	switch arangosh to new ApplicationFeatures and ProgramOptions	2016-03-08 23:32:43 +01:00
Aql	Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk	2016-03-10 10:46:30 +01:00
Cluster	Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk	2016-03-10 10:46:30 +01:00
Dispatcher	switch arangosh to new ApplicationFeatures and ProgramOptions	2016-03-08 23:32:43 +01:00
FulltextIndex	Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk	2016-03-09 09:42:10 +01:00
GeoIndex	Detect invalid lat/longitude on remove and searches	2016-02-02 14:52:08 +00:00
HttpServer	Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk	2016-03-09 09:42:10 +01:00
Indexes	Fixed PrimaryIndex iterator creation from AQL. Got my first FILTER x._key == 'test' query running. yeah	2016-03-10 11:10:58 +01:00
Replication	Kill further uses of update_policy.	2016-03-10 00:07:51 +01:00
Rest	simplified init	2016-02-23 15:26:22 +01:00
RestHandler	Get rid of update_policy for good.	2016-03-10 00:14:06 +01:00
RestServer	Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk	2016-03-09 09:42:10 +01:00
Scheduler	Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk	2016-03-09 09:42:10 +01:00
Statistics	switch arangosh to new ApplicationFeatures and ProgramOptions	2016-03-08 23:32:43 +01:00
Utils	Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk	2016-03-10 11:25:20 +01:00
V8Server	Fixed merge bug. Last commit didn't build	2016-03-10 11:10:13 +01:00
VocBase	Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk	2016-03-10 10:46:30 +01:00
Wal	Kill further uses of update_policy.	2016-03-10 00:07:51 +01:00
CMakeLists.txt	removed unused functionality	2016-03-09 23:14:29 +01:00