Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
arangodb/arangod
History
Frank Celler 055e172bdb Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4 
Conflicts:
	arangod/Replication/Syncer.cpp
	arangod/VocBase/index-garbage-collector.c
	build_posix.h
	html/admin/api-docs/traversal.json
	js/apps/aardvark/api-docs/collection.json
	js/apps/aardvark/api-docs/cursor.json
	js/apps/aardvark/api-docs/document.json
	js/apps/aardvark/api-docs/edge.json
	js/apps/aardvark/api-docs/edges.json
	js/apps/aardvark/api-docs/graph.json
	js/apps/aardvark/api-docs/index.json
	js/apps/aardvark/api-docs/replication.json
	js/apps/aardvark/api-docs/simple.json
	js/apps/aardvark/api-docs/system.json
 		2013-09-05 13:03:07 +02:00
..
Actions Merge branch 'devel' into multiple_databases 2013-06-03 17:05:01 +02:00
Ahuacatl Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4 2013-09-05 13:03:07 +02:00
BitIndexes added TRI_JSON_STRING_REFERENCE 2013-07-10 17:00:29 +02:00
CapConstraint cap constraint for replication logger 2013-07-31 16:56:56 +02:00
FulltextIndex fixed issues reported by VS 2012 2013-08-29 16:43:56 +02:00
GeoIndex fixed compiler warnings 2013-06-28 17:10:42 +02:00
HashIndex do not traverse invalid memory for hash index results 2013-07-02 17:16:35 +02:00
IndexIterators updated disclaimer 2013-03-13 17:03:18 +01:00
IndexOperators updated disclaimer 2013-03-13 17:03:18 +01:00
MRServer updated mruby to 2013-08-22 2013-08-22 21:03:04 +02:00
PriorityQueue OOM handling 2013-07-02 17:33:31 +02:00
Replication Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4 2013-09-05 13:03:07 +02:00
RestHandler fixed redirect URLs 2013-09-04 17:30:37 +02:00
RestServer force lower-case database names 2013-09-05 12:43:03 +02:00
SkipLists typos 2013-06-21 19:41:43 +02:00
SkipListsEx conditionalised transactional skiplists with TRI_SKIPLIST_EX until fully integrated and tested 2013-08-01 14:55:09 +02:00
Utils multiple database, becoming standard 2013-09-02 09:52:52 +02:00
V8Server Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-09-05 12:34:45 +02:00
VocBase force lower-case database names 2013-09-05 12:43:03 +02:00
Makefile.files removed all replication conditionals 2013-07-30 13:16:37 +02:00