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

1014 Commits

Author SHA1 Message Date
Jan Steemann 81470465ac merge with SVN 2012-03-29 16:41:29 +02:00
Frank Celler dd1da38dbf Merge branch 'master' of github.com:triAGENS/AvocadoDB 
Conflicts:
	VocBase/simple-collection.c
 2012-03-29 14:39:29 +02:00
Frank Celler ce60a20d47 added stress test 2012-03-29 14:39:05 +02:00
Frank Celler 865d0936e4 added stress test 2012-03-29 14:39:03 +02:00
Jan Steemann 7e7873e8b8 merge with SVN 2012-03-29 13:34:50 +02:00
Jan Steemann a99e40784a fixed Makefile 2012-03-29 11:17:18 +02:00
Frank Celler 3b36edfdcb Merge branch 'master' of github.com:triAGENS/AvocadoDB 2012-03-29 11:12:03 +02:00
Frank Celler 6dfd458d63 fix for dead-lock 2012-03-29 11:11:54 +02:00
Frank Celler b888228c2e more tests 2012-03-29 11:11:34 +02:00
Jan Steemann 102c32b14b merge with svn 2012-03-29 09:37:40 +02:00
Frank Celler d7d2d341a7 tests are still failed 2012-03-28 18:28:40 +02:00
Frank Celler 304aadbb4b fixed examples, removed parameter info 2012-03-28 18:19:54 +02:00
Frank Celler 2b7393eb6e Merge branch 'master' of github.com:triAGENS/AvocadoDB 
Conflicts:
	js/actions/system/api-database.js
	js/actions/system/front-end.js
 2012-03-28 18:15:31 +02:00
Frank Celler 27d7ba9fb8 more http api 2012-03-28 18:14:35 +02:00
Jan Steemann f1bf5d06f5 merge with SVN 2012-03-28 16:00:47 +02:00
Jan Steemann 7592e541a5 adjusted Makefile 2012-03-28 14:03:20 +02:00
Jan Steemann 6f35cfaecc merge with SVN 2012-03-28 14:01:41 +02:00
Frank Celler 46243e8288 cleanup 2012-03-28 11:50:18 +02:00
Frank Celler 356d95a279 more tests for api-collection 2012-03-28 11:37:22 +02:00
Frank Celler 204522d465 merged with JAN 2012-03-28 11:18:43 +02:00
Frank Celler 84697d5f8c merged with JAN 2012-03-28 10:19:45 +02:00
Frank Celler d746cc6eec create document 2012-03-27 23:27:32 +02:00
Frank Celler 2a789cb0e3 create collection 2012-03-27 23:24:57 +02:00
Frank Celler 738799b70a more tests and delete 2012-03-27 22:24:44 +02:00
Frank Celler bd17cfab54 more _api/collection 2012-03-27 18:07:55 +02:00
Frank Celler de8b6d1467 Merge branch 'master' of github.com:triAGENS/AvocadoDB 
Conflicts:
	VocBase/vocbase.c
	VocBase/vocbase.h
 2012-03-27 13:14:40 +02:00
Frank Celler e03abf4f06 added drop collection 2012-03-27 13:11:05 +02:00
Jan Steemann d7d21b5433 added test file 2012-03-27 10:42:03 +02:00
Jan Steemann e0c9f07972 Merge branch 'master' of https://github.com/triAGENS/AvocadoDB 
Conflicts:
	UnitTests/RestDocuments/rest_update-document_spec.rb
 2012-03-27 10:00:12 +02:00
Jan Steemann 44ee6c14b2 added collection usage changes from SVN 2012-03-27 09:57:47 +02:00
Frank Celler f69a009a38 fixed examples 2012-03-26 23:39:09 +02:00
Frank Celler a8e9614243 fixed examples 2012-03-26 23:31:30 +02:00
Frank Celler d437455705 fixed examples 2012-03-26 23:30:51 +02:00
Frank Celler 54d28404e9 added documentation 2012-03-26 23:16:55 +02:00
Frank Celler 7ef0fe6119 fix wrong tests 2012-03-26 23:15:16 +02:00
Frank Celler 23968dd94e doc 2012-03-26 21:53:34 +02:00
Frank Celler 38d7e970d1 merged 2012-03-26 17:18:32 +02:00
Frank Celler fd1ab94663 fix for wrong cid 2012-03-26 17:17:57 +02:00
Frank Celler be33a5c44f merged 2012-03-26 16:50:21 +02:00
Frank Celler f295e32b8c merged 2012-03-26 16:38:44 +02:00
Frank Celler 684afc2e20 rebased 2012-03-26 16:11:31 +02:00
Frank Celler e0155307c5 added unload 2012-03-26 16:11:31 +02:00
Frank Celler 4aa24404b9 added rename 2012-03-26 16:11:31 +02:00
Frank Celler bd0ade543b added constraints 2012-03-26 16:11:31 +02:00
Frank Celler f5b2f09e46 rebeased 2012-03-26 16:11:31 +02:00
Frank Celler 25efb01569 added constraints 2012-03-26 16:11:31 +02:00
Frank Celler 30ee6a54eb index constraint 2012-03-26 16:11:31 +02:00
Frank Celler b383bfd43a lock order 2012-03-26 16:11:31 +02:00
Frank Celler 4d03a86651 added unload 2012-03-26 16:11:31 +02:00
Frank Celler 0e1e5eb816 added rename 2012-03-26 16:11:31 +02:00