1
0
Fork 0
Commit Graph

5305 Commits

Author SHA1 Message Date
Jan Steemann 80f01892b7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-12 12:56:03 +01:00
Jan Steemann 71b2587d96 added assertions for debugging 2013-03-12 12:55:52 +01:00
Frank Celler deee332a3d fixed geo-index remove 2013-03-12 12:50:05 +01:00
Frank Celler 1803f409b2 fixed skip list index
Conflicts:
	arangod/SkipLists/skiplistIndex.c
2013-03-12 11:13:22 +01:00
Jan Steemann 8888fe4cc5 dont truncate collection id in error message 2013-03-12 10:31:54 +01:00
Jan Steemann 9b688907f0 handle out of memory properly when open-iterating a collection 2013-03-12 10:26:35 +01:00
Jan Steemann ac83bcf79b better report errors 2013-03-12 10:26:15 +01:00
Jan Steemann 270de94a77 log out of memory errors 2013-03-12 09:27:44 +01:00
Jan Steemann 082244cbeb handle out of memory in voc-shaper 2013-03-12 09:20:56 +01:00
Jan Steemann a091a72ef2 added test 2013-03-11 15:24:11 +01:00
a-brandt 626b178c32 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-11 15:03:43 +01:00
a-brandt 6b5e291d02 bugfix: *mustFree has to be true in some test cases 2013-03-11 15:03:24 +01:00
Frank Celler 8787bb7f00 replaced index update by remove/insert
Conflicts:
	arangod/HashIndex/hash-index.c
	arangod/VocBase/index.c
2013-03-11 14:23:23 +01:00
Jan Steemann 8ddf718c81 more detailed logging 2013-03-11 13:41:39 +01:00
a-brandt d4ea6bfa31 documentation updates 2013-03-11 13:01:17 +01:00
Jan Steemann 206681159f fixed memory zone mismatches 2013-03-11 11:10:08 +01:00
Jan Steemann 5412fc418a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-11 10:59:32 +01:00
Jan Steemann 799d7f02ee fixed memory zones 2013-03-11 10:59:16 +01:00
a-brandt 4f6fbd9cd3 added more tests 2013-03-11 10:53:37 +01:00
Jan Steemann ab0752102d why? 2013-03-11 10:44:26 +01:00
Jan Steemann 6a4245b5c8 fixed deadlock 2013-03-11 10:37:17 +01:00
Jan Steemann 660610ae71 fixed memory zone mismatches 2013-03-11 10:30:54 +01:00
Jan Steemann d5855c0c1f fixed some memory zone mismatches 2013-03-11 10:25:09 +01:00
Frank Celler b8ef779aa7 fixed merge errors 2013-03-11 09:54:56 +01:00
Frank Celler 9543bbcba0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-11 09:50:12 +01:00
Frank Celler c915bfa5ff cleanup of indexes, fix for compaction (hash, cap, geo)
Conflicts:
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
2013-03-11 09:49:58 +01:00
Jan Steemann cd5a675f62 fixed making arangoirb 2013-03-11 09:39:42 +01:00
Jan Steemann 386b6ca004 removed unused option 2013-03-08 22:31:31 +01:00
Jan Steemann af2d966559 fixed a typo 2013-03-08 22:31:17 +01:00
Jan Steemann b66a7492b9 addendum for issue #443 2013-03-08 22:30:35 +01:00
Jan Steemann b7086fe93d removed unused fe-configuration handler 2013-03-08 20:26:06 +01:00
Jan Steemann d6a6cc8b55 fixed jslint issue 2013-03-08 18:36:23 +01:00
Jan Steemann 1a7e6b2d5b colorize! 2013-03-08 18:36:11 +01:00
Jan Steemann 0206076fda stringifying collections should honor colors 2013-03-08 17:38:20 +01:00
Jan Steemann 83c0326145 disallow specifying indexes on internal attributes (_key, _from, _to etc.).
This has never worked before and will never work, so return an error if this is tried
2013-03-08 17:26:47 +01:00
a-brandt b3c9654895 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-08 17:00:33 +01:00
a-brandt 1f4685a17d #412 added If-None-Match, If-Match and waitForSync 2013-03-08 17:00:15 +01:00
a-brandt 14226be22a added link to graph collection 2013-03-08 16:57:09 +01:00
Jan Steemann cd753182f1 fixed doxygen errors 2013-03-08 16:56:52 +01:00
a-brandt e952b28aab changed http return codes for document update and delete 2013-03-08 16:56:15 +01:00
Jan Steemann e6c28d50b3 cleanup: removed TRI_HAVE_ICU and internal.HAVE_ICU (always true) 2013-03-08 16:09:47 +01:00
Jan Steemann b7c35e71a4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-08 16:04:18 +01:00
Jan Steemann 99630450c2 removed checks for TRI_HAVE_ICU because ICU is a prerequisite for using ArangoDB 2013-03-08 16:03:54 +01:00
Jan Steemann eabad7befb Merge pull request #445 from luebbert42/devel
removed old versions of cheat sheet and fixed url to  admin interface in version 1.2
2013-03-08 06:41:06 -08:00
Doerthe Luebbert 329ea8a5be removed old versions of cheat sheet and fixed url to admin interface 2013-03-08 15:32:01 +01:00
Jan Steemann 17e8ea3657 updated CHANGELOG 2013-03-08 15:25:50 +01:00
Jan Steemann 0769f311e7 issue #444: make colors portable 2013-03-08 15:25:18 +01:00
Jan Steemann ed8920ca0d updated CHANGELOG 2013-03-08 15:17:14 +01:00
Jan Steemann 1ea4c1c4b0 issue #443 2013-03-08 15:16:29 +01:00
Jan Steemann 69fc6e1662 added test case 2013-03-08 14:38:08 +01:00