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

3348 Commits

Author SHA1 Message Date
Frank Celler 13f91392bb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 12:51:00 +02:00
Frank Celler 4ae1f0cd4a added temporary attribute entries in shaper 2014-06-26 12:50:50 +02:00
Jan Steemann 9f37a21729 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 12:37:11 +02:00
Jan Steemann 07d244488d changed crud signatures 2014-06-26 12:37:01 +02:00
scottashton de0da1e7b7 changed signature of the traversal functions 2014-06-26 11:55:35 +02:00
Jan Steemann f558878964 nullptr 2014-06-26 11:53:54 +02:00
Jan Steemann 723a0ab265 fixed some memory errors 2014-06-26 11:52:37 +02:00
Jan Steemann 183469227c fixed rollback of updates 2014-06-26 11:38:41 +02:00
Jan Steemann 1ebaa7e35c make primary hash index hash function explicit 2014-06-26 11:20:12 +02:00
Thomas Schmidts 45f27782e0 More changes in the documentation code 2014-06-25 17:27:12 +02:00
Thomas Schmidts a43e8e065d Some changes in the documentation code 2014-06-25 16:29:17 +02:00
Thomas Schmidts cba9529153 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-25 16:15:36 +02:00
scottashton 9d0399ee0e new templates for graph management 2014-06-25 16:08:21 +02:00
scottashton 235a438c0c finished documentation of complexity 2014-06-25 15:51:41 +02:00
Thomas Schmidts 4d7b22b05a Some changes in the documentation code 2014-06-25 15:17:51 +02:00
Thomas Schmidts f005d676cb Some changes in the code documentation 2014-06-25 15:10:13 +02:00
Thomas Schmidts f7be757b0b Some changes in the code documentation 2014-06-25 14:57:29 +02:00
Frank Celler 291c92dbf3 renamed ReadOnly to NoCreate 2014-06-25 14:32:00 +02:00
Jan Steemann 81a0180c8f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 17:32:51 +02:00
Jan Steemann 66ffe61a76 renamed enum values 2014-06-24 17:32:43 +02:00
Thomas Schmidts 34e1addcfb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 17:23:54 +02:00
Jan Steemann 0d75f16e09 NULL 2014-06-24 16:31:19 +02:00
Jan Steemann 68f2b5a926 removed bogus error message 2014-06-24 16:11:53 +02:00
Jan Steemann f411fceb2e exposed WAL API 2014-06-24 16:10:27 +02:00
Thomas Schmidts f4c6c97488 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 16:09:27 +02:00
Jan Steemann a289c9aa78 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 15:11:30 +02:00
Jan Steemann c4aad1e0cd added tests 2014-06-24 15:11:19 +02:00
Thomas Schmidts 0bf957ddd7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 14:28:50 +02:00
Thomas Schmidts 0d969e6814 Changes in the gitbook, also bug fixing in code 2014-06-24 14:28:30 +02:00
scottashton 3cc95a23fd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 14:27:16 +02:00
Jan Steemann 9e818fb010 removed warnings 2014-06-24 14:26:51 +02:00
scottashton 3dc7188141 heal the build 2014-06-24 14:26:46 +02:00
Jan Steemann 50fba66900 close failed transactions on start 2014-06-24 13:56:17 +02:00
scottashton 3ba8719173 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 13:13:09 +02:00
scottashton 4f01409c4b processed lucas feedback regarding aql docu 2014-06-24 13:13:01 +02:00
Jan Steemann 7756deff01 typo 2014-06-24 12:07:00 +02:00
Jan Steemann 303378d8e2 honor `--server.disable-statistics` 2014-06-24 12:06:47 +02:00
Jan Steemann 4f282cbe02 removed startup option `--database.remove-on-drop` 2014-06-24 11:54:32 +02:00
Jan Steemann 97e36a7eb0 fixed examples 2014-06-24 11:26:51 +02:00
Jan Steemann 98f87b1f80 write-throttling 2014-06-24 10:55:05 +02:00
Jan Steemann 9695b25673 added tests 2014-06-24 09:19:26 +02:00
Jan Steemann 8ec5ad2a1e removed bogus warning 2014-06-24 09:02:36 +02:00
Jan Steemann cc041c4851 typecasts 2014-06-24 08:20:35 +02:00
Jan Steemann 5ce280b5f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 00:38:33 +02:00
Jan Steemann d56719ae4d simplification of signatures 2014-06-24 00:32:40 +02:00
Thomas Schmidts 8d4527a8c9 Changed Documentation in code 2014-06-24 00:01:27 +02:00
Jan Steemann 53909c0dcd adjusted tests 2014-06-23 18:45:06 +02:00
Jan Steemann e89e390cda re-added replication applier 2014-06-23 17:55:08 +02:00
Jan Steemann f72ccde9cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 17:46:25 +02:00
Jan Steemann 13e061bd76 fixed tests 2014-06-23 17:46:00 +02:00
Thomas Schmidts 03881bf63c Made Examples instead of verbinclude 2014-06-23 17:16:19 +02:00
Thomas Schmidts 19bd94b967 Added line to Makefiles.files for code examples 2014-06-23 17:00:36 +02:00
Thomas Schmidts af1805b627 Fixed small spelling errors 2014-06-23 15:15:50 +02:00
Thomas Schmidts 10a5b782fd Some changes in the documentation code 2014-06-23 14:55:14 +02:00
Jan Steemann 34a80c08b1 fixed assertion 2014-06-23 14:53:23 +02:00
Jan Steemann 82bd150a11 dump 2014-06-23 14:32:06 +02:00
Jan Steemann b31c2330d4 exclude collections 2014-06-23 14:24:12 +02:00
Jan Steemann c930740862 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:22:56 +02:00
Jan Steemann 3b0d8b15d6 re-added replication 2014-06-23 13:22:38 +02:00
Thomas Schmidts 7b11a3e9f3 Changed some comments in code 2014-06-23 13:22:02 +02:00
Jan Steemann ebb7e61045 removed code for special handling of _trx and _replication 2014-06-23 09:03:42 +02:00
Thomas Schmidts 06e033c0c8 Some improvements in the python script 2014-06-23 08:55:47 +02:00
Jan Steemann 82a220361c issue #919: fixed null options handling 2014-06-23 08:40:51 +02:00
Jan Steemann fc823938c0 nullptr 2014-06-21 03:27:38 +02:00
Jan Steemann 72f54eee21 simplified 2014-06-21 02:39:26 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +02:00
Jan Steemann f66f4688aa fixed invalid marker size 2014-06-20 18:13:27 +02:00
Frank Celler 28f4433bff Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Wal/LogfileManager.cpp
 2014-06-20 16:43:28 +02:00
Frank Celler 24a5ec0739 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/Ahuacatl/ahuacatl-grammar.cpp
	arangod/Ahuacatl/ahuacatl-grammar.h
 2014-06-20 16:42:43 +02:00
Jan Steemann 5556cd8dad fixed startup on Windows 2014-06-20 16:42:21 +02:00
Frank Celler 4dcf5dc817 updated disclaimer 2014-06-20 16:40:35 +02:00
Jan Steemann 0d1a4b4b80 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 16:14:03 +02:00
Jan Steemann 022d7f32d0 bison 2014-06-20 16:13:49 +02:00
Lucas Dohmen 95fb92b195 Move testrunner into the org/arangodb 'namespace' 2014-06-20 16:05:09 +02:00
Jan Steemann 99a67861e6 fixed VS warnings 2014-06-20 15:51:53 +02:00
gschwab eefd78ae0a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 15:49:23 +02:00
Jan Steemann 7e52ebbc3b fixes for Visual Studio 2014-06-20 15:46:33 +02:00
gschwab 3fb7a85ca0 error handling 2014-06-20 15:36:26 +02:00
Thomas Schmidts 90ad06833f Change some comments in the code 2014-06-20 15:10:16 +02:00
Frank Celler 5ac431a453 generated files 2014-06-20 15:06:18 +02:00
Jan Steemann 65eac66ca3 silence compiler 2014-06-20 14:36:27 +02:00
Jan Steemann 09a64c1f7f fixed compile warnings 2014-06-20 14:30:36 +02:00
Jan Steemann 7b6af73f85 added check for number of logfiles 2014-06-20 13:52:05 +02:00
Jan Steemann 9b713fccba renamed macro 2014-06-20 13:43:29 +02:00
Jan Steemann a56a0e457c fixed edge index hashing error 2014-06-20 13:37:52 +02:00
Jan Steemann 1ff9bbb2f7 check startup options 2014-06-20 09:45:27 +02:00
Jan Steemann 56b032c688 more tests 2014-06-20 09:38:35 +02:00
Jan Steemann cc35e4696c added more tests 2014-06-20 09:20:27 +02:00
Jan Steemann c60bde28b6 added crash tests 2014-06-20 08:36:36 +02:00
Jan Steemann 6c0dcf85c4 WAL DDL markers 2014-06-19 14:33:38 +02:00
Jan Steemann d266bedd38 removed now obsolete functions 2014-06-19 12:08:01 +02:00
Jan Steemann 5fb901d713 cppcheck 2014-06-18 21:27:53 +02:00
Jan Steemann 9fc03ec85f cppcheck 2014-06-18 21:13:20 +02:00
Jan Steemann 005e089a43 fixed compile error 2014-06-18 20:10:04 +02:00
Jan Steemann d3221c33ba fixed undefined variable 2014-06-18 17:29:58 +02:00
Jan Steemann 589ff8e208 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 17:26:20 +02:00
Jan Steemann e11581b430 removed now obsolete functions 2014-06-18 17:26:04 +02:00
Jan Steemann d51fb26272 indenting 2014-06-18 17:16:14 +02:00
Jan Steemann 1d68586500 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-18 16:37:28 +02:00
Frank Celler f5419205ac added voice 2014-06-18 16:34:55 +02:00
Jan Steemann 8b9cdbe075 fixed tests 2014-06-18 16:34:11 +02:00
Jan Steemann d1cdd1e40f macos 2014-06-18 15:27:25 +02:00
Jan Steemann b952c6724d recovery 2014-06-17 18:19:04 +02:00
Jan Steemann acba4c8851 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	CHANGELOG
 2014-06-17 15:31:04 +02:00
Jan Steemann 091491d13b crash recovery tests 2014-06-17 15:30:11 +02:00
Frank Celler f794ee8368 fixed datafile debugger 
Conflicts:
	CHANGELOG
 2014-06-17 09:22:56 +02:00
Jan Steemann 30460bb72c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-17 00:49:37 +02:00
Jan Steemann b303db2b50 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
 2014-06-17 00:49:18 +02:00
Jan Steemann 793ad88cbe slightly adjusted grammar 2014-06-17 00:45:42 +02:00
Jan Steemann a1177816aa modifiable AQL, final syntax 2014-06-17 00:37:08 +02:00
Jan Steemann 74fb8fe2ad issue #906: changed returned field in primary index description from `_id` to `_key`. 2014-06-16 17:08:45 +02:00
Jan Steemann ff494cc897 added recovery tests (not functional yet) 2014-06-16 16:52:26 +02:00
Lucas Dohmen b5764513d9 Extracted the test runner from jsunity 2014-06-16 14:39:40 +02:00
Jan Steemann 2a0e0b18d0 added many tests 2014-06-16 14:39:26 +02:00
Jan Steemann b3d18d0deb cppcheck 2014-06-16 09:50:38 +02:00
Jan Steemann ae6ac271e3 index rework 2014-06-14 23:40:56 +02:00
Jan Steemann 37a30b420d prevent exceptions 2014-06-14 15:05:54 +02:00
Jan Steemann 964af24fe7 fixed compiler warnings 2014-06-14 01:49:17 +02:00
Jan Steemann b54b89d68d key generator rework 2014-06-14 00:33:40 +02:00
Jan Steemann 35a81dc54d more asserts 2014-06-13 21:40:34 +02:00
Jan Steemann 34389a10d3 added AQL TRANSLATE function 2014-06-13 19:53:58 +02:00
Jan Steemann 0c5950507c fixed test 2014-06-13 17:50:44 +02:00
Jan Steemann 47999865d6 read-only mode 2014-06-13 15:32:13 +02:00
Jan Steemann d7f35bcc7b fixed datafile ticks issues 2014-06-13 14:46:21 +02:00
Jan Steemann fabc51f889 fixed wrong ASSERT usage 2014-06-13 12:10:35 +02:00
Jan Steemann 80a70667c0 made headers a real class 2014-06-13 11:31:40 +02:00
Jan Steemann d5e695e63f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/ArangoServer.h
	arangod/VocBase/server.cpp
	js/common/bootstrap/errors.js
 2014-06-13 02:23:03 +02:00
Jan Steemann bbdbbd5736 removed implicit parameter from function signature 2014-06-13 01:59:19 +02:00
Jan Steemann 1b94fbf904 fixed crash in dump 2014-06-13 01:53:44 +02:00
Jan Steemann 41dc6a808e fixed recovery 2014-06-13 00:20:24 +02:00
Jan Steemann 2fc5647892 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 18:13:57 +02:00
Jan Steemann bc52f3408f recovery, not functional yet 2014-06-12 18:13:48 +02:00
Max Neunhoeffer 131da49f60 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 15:42:06 +02:00
Max Neunhoeffer 982ca7460b Implement StringifyMarkerDump for WAL markers. 
This implements a LegendReader class inheriting from TRI_shaper_t,
to allow for TRI_StringifyArrayShapedJson to work.
 2014-06-12 15:30:18 +02:00
Jan Steemann 93862b99ed add handlers for remove, update, save, replace 2014-06-12 14:00:52 +02:00
Max Neunhoeffer 9f4a2236e0 Adjust some comments. 2014-06-12 12:07:48 +02:00
Jan Steemann 0c8e01ca40 fixed assertion fail 2014-06-12 12:00:58 +02:00
Jan Steemann 101b5ac95f Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 11:29:08 +02:00
Jan Steemann dae5a5151d call (still empty) WAL recovery procedure at startup 2014-06-12 11:28:48 +02:00
Max Neunhoeffer d939dce2e1 Fix compilation for arangodump. 2014-06-12 10:45:00 +02:00
Max Neunhoeffer ed1a588baa Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 10:39:13 +02:00
Max Neunhoeffer 82ab5bc0ac More checks for protected getShaper accesses. 
Also: Make arangodump possible using fake trx objects.
 2014-06-12 10:38:39 +02:00
Jan Steemann bca5b999d9 removed fcall 2014-06-12 10:26:53 +02:00
Jan Steemann 1cc46c4626 copy WAL documents 2014-06-12 10:26:24 +02:00
Frank Celler 299b99ed00 fixed check-version for empty directory 2014-06-11 19:30:12 +02:00
Jan Steemann 89f6070e01 cppcheck 2014-06-11 17:53:44 +02:00
Jan Steemann 86171cd881 removed old-style comments 2014-06-11 17:48:09 +02:00
Jan Steemann fa6e98d94c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
 2014-06-11 17:40:15 +02:00
Jan Steemann 9de0b212c4 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-11 17:39:06 +02:00
Jan Steemann cc115a2766 removed outdated upgrade methods 2014-06-11 17:38:49 +02:00
Max Neunhoeffer 1d8e5f73d0 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-11 16:11:49 +02:00
Max Neunhoeffer f83a845c31 Activate shaper protection runtime check. Fix bugs. 2014-06-11 16:11:26 +02:00
Jan Steemann 9535779916 removed lol message 2014-06-11 15:52:58 +02:00
Jan Steemann 772ed8bccc hash index optimization 2014-06-11 15:46:55 +02:00
scottashton 8209796f7c added documentation to ahuacatl general graph functions and refactored common_Neighbors and common_properties 2014-06-11 15:45:31 +02:00
Max Neunhoeffer 88a19e5928 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	lib/ShapedJson/Legends.cpp
 2014-06-11 14:22:53 +02:00
Max Neunhoeffer b8ac498e8b Add shaper test (inactive for now). 2014-06-11 14:21:48 +02:00
Jan Steemann 28d2ae151e flush 2014-06-11 14:18:04 +02:00
Jan Steemann b802973273 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/Wal/CollectorThread.cpp
 2014-06-11 11:33:48 +02:00
Jan Steemann 7e6750c397 wal flush w/ collection unload 2014-06-11 11:33:02 +02:00
Max Neunhoeffer f0bef2496f Make _shaper private and use getter/setter. 2014-06-11 11:18:22 +02:00
Max Neunhoeffer 6b31c2ddb1 Sort out deallocation of TRI_document_collection_t and TRI_collection_t. 2014-06-11 10:56:28 +02:00
Max Neunhoeffer c2bddb1c19 Let TRI_document_collection_t inherit from TRI_collection_t. 2014-06-11 10:51:47 +02:00
Max Neunhoeffer af17694ec1 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-11 09:37:43 +02:00
Max Neunhoeffer 2527e34d9d stuct TRI_collection_t and struct TRI_document_collection_t 2014-06-11 09:37:07 +02:00
Jan Steemann 5a8cdb0ec5 wal flush 2014-06-11 09:32:20 +02:00
Max Neunhoeffer c5e5e64135 Initialise _dataptr in constructor. 
Fix a bug found by a unittest.
 2014-06-10 21:42:23 +02:00
Max Neunhoeffer 8b8d11eb61 Check in ahuacatl-grammar generated files. 2014-06-10 21:42:01 +02:00
Jan Steemann eba885d583 fixed member initialization in second constructor 2014-06-10 17:41:11 +02:00
Max Neunhoeffer dd9c4810e1 Revert "Add protector assertions in voc-shaper." 
This reverts commit f0ed0d9122fa6470ff9a30d4cb732becc206886c.
 2014-06-10 16:46:18 +02:00
Jan Steemann 2a13bc9527 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 16:43:12 +02:00
Max Neunhoeffer eb8453e455 Add protector assertions in voc-shaper. 2014-06-10 16:42:46 +02:00
Jan Steemann dfc34c0c98 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 16:42:43 +02:00
Jan Steemann 7c599ef893 barriers 2014-06-10 16:42:15 +02:00
Max Neunhoeffer 12a5ba03fd Move class TransactionBase to voc-types.h 2014-06-10 16:37:35 +02:00
Max Neunhoeffer e405d06370 AQL syntax now "REMOVE d IN coll" instead of "FROM" to avoid keyword FROM. 2014-06-10 16:05:17 +02:00
Max Neunhoeffer c49f1a80d6 Went through all TRI_doc_mptr\(_copy\)_t ... 
... to see whether _copy is needed.
 2014-06-10 16:04:30 +02:00
Max Neunhoeffer e575b94222 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 15:56:31 +02:00
Max Neunhoeffer 30e16bc127 Fix two comments. 2014-06-10 15:51:53 +02:00
Jan Steemann c686c13c91 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 15:42:46 +02:00
Jan Steemann ede9c634c3 assert 2014-06-10 15:42:39 +02:00
Jan Steemann 7e181d0bfa changed keywords 2014-06-10 15:42:05 +02:00
Max Neunhoeffer f07cba1cc3 Remove Hans accidentally committed. 2014-06-10 15:20:42 +02:00
Max Neunhoeffer 7f867a0940 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 15:19:40 +02:00
Max Neunhoeffer 02a8b4e388 Edge index lookup returns now TRI_doc_mptr_copy_t. 
Move TRI_document_edge_t to voc-types.h.
 2014-06-10 15:19:11 +02:00
Jan Steemann 43600f712f Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 15:06:04 +02:00
Jan Steemann 511a9c6fca let collectorthread adjust sizes 2014-06-10 15:05:48 +02:00
Max Neunhoeffer ea837012f0 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 14:33:25 +02:00
Max Neunhoeffer dbfe62fd66 TRI_SelectByExample now uses copies of master pointers. 2014-06-10 14:32:57 +02:00
Jan Steemann a8e28a01b6 properly return logfile id 2014-06-10 14:32:28 +02:00
Jan Steemann 2d8408dba5 add fake transaction object while collecting 2014-06-10 14:04:14 +02:00
Jan Steemann 14097f5473 create fake transaction for loading collections 2014-06-10 14:01:35 +02:00
Max Neunhoeffer 3f03956fe8 Fake TransactionBase. 2014-06-10 14:00:27 +02:00
Jan Steemann 0883a973aa set header fid 2014-06-10 13:44:25 +02:00
Jan Steemann aa173b315b update cap constraint sizes 2014-06-10 13:40:33 +02:00
Max Neunhoeffer 2dc70409cf Fix protection assertion system one more time. 2014-06-10 13:28:58 +02:00
Max Neunhoeffer d4b5ee25ee Fix protection assertions. 2014-06-10 13:16:01 +02:00
Max Neunhoeffer d0ba832ffb Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/Utils/Transaction.h
 2014-06-10 13:05:33 +02:00
Max Neunhoeffer 3c0c785ba5 First set of protection assertions. 2014-06-10 13:03:04 +02:00
Jan Steemann 85a773e177 cleanup 2014-06-10 12:03:55 +02:00