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

159 Commits

Author SHA1 Message Date
Jan Steemann 5a74e95f35 allow reusing ids and revision when creating collections and documents 2012-06-19 15:50:52 +02:00
Frank Celler 0c9683fb8d Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.in
 2012-06-14 15:04:33 +02:00
Oreste Panaia 9949c9e75c renamed sl-operator.c and sl-operator.h to index-operator.c and index-operator.h respectively 2012-06-14 10:04:41 +08:00
Frank Celler 79449d5d71 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
 2012-06-13 11:40:35 +02:00
Frank Celler 73e50d932f added name for pthreads 2012-06-13 00:12:45 +02:00
Jan Steemann 4ec362fc8f some optimiser stuff 2012-06-12 09:36:58 +02:00
Jan Steemann efd48664ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	Ahuacatl/ahuacatl-statement-dump.c
	Ahuacatl/ahuacatl-statement-dump.h
	Ahuacatl/ahuacatl-statementlist.c
	Ahuacatl/ahuacatl-tree-dump.c
	Ahuacatl/ahuacatl-tree-dump.h
	Ahuacatl/ahuacatl-tree-walker.h
	Makefile.files
	Makefile.in
	arangod/Ahuacatl/ahuacatl-tree-dump.c
	arangod/Ahuacatl/ahuacatl-tree-dump.h
	arangod/Ahuacatl/ahuacatl-tree-walker.c
	arangod/Ahuacatl/ahuacatl-tree-walker.h
 2012-06-08 17:34:20 +02:00
Frank Celler 313c3c31ed Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/V8Client/arangosh.cpp
 2012-06-08 15:13:01 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00