1
0
Fork 0
arangodb/arangod/VocBase
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
2012-08-02 17:17:36 +02:00
..
auth.c Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into devel 2012-07-26 12:03:03 +02:00
auth.h added basic authentication 2012-07-15 17:06:59 +02:00
barrier.c
barrier.h
blob-collection.c
blob-collection.h
collection.c added datafile map for collection 2012-07-25 20:56:34 +02:00
collection.h added datafile map for collection 2012-07-25 20:56:34 +02:00
compactor.c
compactor.h
datafile.c datafile check 2012-07-28 20:57:03 +02:00
datafile.h datafile check 2012-07-28 20:57:03 +02:00
document-collection.c issue #121: added more output to the figures() API call 2012-07-04 12:15:16 +02:00
document-collection.h added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
durham.h
general-cursor.c
general-cursor.h
headers.c
headers.h
index.c bitarray index now support explicit values 2012-08-02 15:20:43 +08:00
index.h removed exec flag 2012-07-10 10:46:20 +02:00
shadow-data.c
shadow-data.h
simple-collection.c Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 2012-08-02 17:17:36 +02:00
simple-collection.h removed TRI_IndexSimCollection (locking was broken for this function) 2012-07-25 16:47:50 +02:00
synchroniser.c issue #98: Unable to change journalSize 2012-07-11 13:42:17 +02:00
synchroniser.h
voc-shaper.c added ExtractShapedJsonVocShaper 2012-07-16 15:42:41 +02:00
voc-shaper.h added ExtractShapedJsonVocShaper 2012-07-16 15:42:41 +02:00
vocbase.c Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1 2012-07-24 22:19:46 +02:00
vocbase.h added basic authentication 2012-07-15 17:06:59 +02:00