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

15 Commits

Author SHA1 Message Date
Frank Celler db868d1147 Merge branch 'oreste' of github.com:triAGENS/AvocadoDB 
Conflicts:
	BasicsC/vector.c
 2012-05-08 09:31:26 +02:00
Frank Celler de0b90b664 merged with oreste 2012-05-08 09:28:18 +02:00
Frank Celler e878af3cf1 fixed eol 2012-05-03 13:17:18 +02:00
Frank Celler 5aae1ea615 merged Oreste's newest changes 2012-05-03 09:22:22 +02:00
Frank Celler a0306acaf0 Merge branch 'master' of https://github.com/triAGENS/AvocadoDB 
Conflicts:
	SkipLists/skiplist.c
	SkipLists/sl-operator.c
	VocBase/index.c
 2012-04-27 15:50:16 +02:00
Frank Celler 88843a4972 merged with oreste 2012-04-27 14:39:42 +02:00
Frank Celler 89549b186e added memset parameter 2012-04-27 12:34:20 +02:00
Frank Celler b77ff9e77d more memory zones 2012-04-26 17:27:27 +02:00
Frank Celler 84697d5f8c merged with JAN 2012-03-28 10:19:45 +02:00
Frank Celler 2bb58c386a merged 2012-03-20 09:35:10 +01:00
Frank Celler c64f76b701 started rewrite of rest interface 2012-03-16 17:58:30 +01:00
Frank Celler b7e6c26ce3 merged Jan's and Achim's changes 2012-03-15 16:47:50 +01:00
Frank Celler 161993203f merge new queries 2012-03-08 14:59:12 +01:00
Frank Celler 73ce88d0fc more for QL (Jan) 2012-03-01 13:51:47 +01:00
Frank Celler 54dc883aba added SkipList (O), added QL (Jan), added new SimpleQueries (FC) 2012-02-29 14:18:39 +01:00