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

7 Commits

Author SHA1 Message Date
Oreste Panaia f93eef34d7 git 
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	lib/ShapedJson/json-shaper.c
 2012-09-10 20:53:41 +08:00
Jan Steemann 112019c7e2 fixed some locking issues 2012-09-07 17:18:16 +02:00
Jan Steemann 595956a6b5 added missing unlocks in case of memory errors 2012-09-07 16:53:14 +02:00
Frank Celler f126016484 added ExtractShapedJsonVocShaper 2012-07-16 15:42:41 +02:00
Frank Celler 994d48f600 fixed file perm 2012-07-16 13:46:06 +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