1
0
Fork 0
Commit Graph

1872 Commits

Author SHA1 Message Date
Jan Steemann 2babd2a1d2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-03 12:58:18 +02:00
Max Neunhoeffer c3fbfba2d9 Try to fix SSL problems, not yet working. 2014-07-03 11:24:05 +02:00
Jan Steemann 60fd8e44e4 nullptr 2014-07-03 10:17:10 +02:00
Jan Steemann abfb1d0f31 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-02 18:52:45 +02:00
Jan Steemann 42ba273589 prevent assertion failure 2014-07-02 18:52:29 +02:00
Thomas Schmidts 0328c9a900 Fixed a few spelling and code erros and deleted last examples 2014-07-02 17:48:54 +02:00
Jan Steemann 33be59ed7e cxx 2014-07-02 17:24:21 +02:00
Jan Steemann 8a36d58524 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-02 16:53:30 +02:00
Jan Steemann 98a0ef0ded prevent endless connection attempts by arangosh 2014-07-02 15:18:24 +02:00
Thomas Schmidts e46d87f23c Changed documentation code in configure chapter 2014-07-02 14:08:41 +02:00
Jan Steemann 40473b58b7 safety 2014-07-02 12:19:28 +02:00
Max Neunhoeffer 77d931b03d Handle strange exceptional case of waitpid. 2014-07-02 11:17:32 +02:00
Thomas Schmidts 55aa1645ac Changes in the code documentation 2014-07-02 09:51:26 +02:00
Jan Steemann 36a67ccf32 comments 2014-07-01 23:32:24 +02:00
Thomas Schmidts a828ed3d08 Changed some code comments 2014-07-01 16:30:36 +02:00
Jan Steemann 270ab5d045 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-01 15:14:22 +02:00
Jan Steemann ef6f7b44ab comments 2014-07-01 15:14:16 +02:00
Thomas Schmidts 0577583aa5 Changes in the documentation code for API 2014-07-01 14:18:12 +02:00
Jan Steemann 0e5679693c fixed compile warnings 2014-07-01 13:17:46 +02:00
Jan Steemann 4cd20bfb7c fixed syncs across multiple files 2014-07-01 13:12:36 +02:00
Frank Celler 7bdc42a7d1 added yy_fatal_error unused function fix 2014-06-30 09:21:24 +02:00
Max Neunhoeffer dc956d3598 Fix linking problem on Linux. 2014-06-30 09:06:10 +02:00
Jan Steemann f2ed881227 upgrade error message 2014-06-29 00:18:42 +02:00
Jan Steemann 1b92282b32 less string buffer moves 2014-06-27 23:58:19 +02:00
Jan Steemann 76de1ae762 cppcheck 2014-06-27 22:20:17 +02:00
Jan Steemann 067dbf63b2 WAL recovery 2014-06-27 19:11:41 +02:00
Jan Steemann d827eaea2d simplified 2014-06-26 15:44:34 +02:00
Frank Celler 74582d1c13 use abort to crash (for MacOS segfault freezes the server) 2014-06-26 14:05:40 +02:00
Frank Celler af6eab46af Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 13:24:53 +02:00
Frank Celler 31dea7dee3 moved scripts to utils 2014-06-26 13:24:42 +02:00
Jan Steemann 96569367d7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/VocBase/document-collection.cpp
2014-06-26 13:07:53 +02:00
Frank Celler 4ae1f0cd4a added temporary attribute entries in shaper 2014-06-26 12:50:50 +02:00
Jan Steemann 723a0ab265 fixed some memory errors 2014-06-26 11:52:37 +02:00
Jan Steemann c4aad1e0cd added tests 2014-06-24 15:11:19 +02:00
Alan Plum d2f0b0efc5 Added HMAC-SHA224, exposed SHA1, SHA224. 2014-06-24 12:49:20 +02:00
Jan Steemann 5846e4a9fe removed startup option `--random.no-seed` 2014-06-24 11:44:28 +02:00
Jan Steemann 5dc4f31e29 dont provide functionality in non-debug mode 2014-06-24 00:34:53 +02:00
Jan Steemann 13e061bd76 fixed tests 2014-06-23 17:46:00 +02:00
Jan Steemann 3b0d8b15d6 re-added replication 2014-06-23 13:22:38 +02:00
Jan Steemann 6ec4cdec53 issue #919: remove potentially existing temporary file 2014-06-21 14:32:59 +02:00
Jan Steemann 69eb029c56 CXX 2014-06-21 03:21:55 +02:00
Jan Steemann ac04c3384e removed double const 2014-06-21 03:20:22 +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 6936972d08 updated disclaimer 2014-06-20 16:41:35 +02:00
gschwab 28b5f27ca6 error added 2014-06-20 16:18:58 +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 ced319c9ca Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 15:37:45 +02:00
Frank Celler b9fd33c473 LLVM does not know __thread 2014-06-20 15:37:12 +02:00
gschwab 3fb7a85ca0 error handling 2014-06-20 15:36:26 +02:00
gschwab ad6e867e9d merge 2014-06-20 15:15:16 +02:00
gschwab b311c94977 exception handling 2014-06-20 15:11:29 +02:00
Jan Steemann 70d589eaa8 fixed compile error 2014-06-20 14:42:17 +02:00
Jan Steemann 09a64c1f7f fixed compile warnings 2014-06-20 14:30:36 +02:00
Jan Steemann 9b713fccba renamed macro 2014-06-20 13:43:29 +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 65d130c0f2 removed unused suppressions file 2014-06-18 22:51:04 +02:00
Jan Steemann a6bb3985bd removed doxygen comments 2014-06-18 22:15:10 +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 589ff8e208 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 17:26:20 +02:00
Jan Steemann 4a28040d37 --enable-failure-tests 2014-06-18 17:09:41 +02:00
Frank Celler 2b3c686e42 rearranged messages 2014-06-18 16:35:09 +02:00
Jan Steemann 0567e64f2f recovery 2014-06-17 18:23:14 +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
Alan Plum a682767efc Added HMAC MD5. 2014-06-17 13:25:07 +02:00
Jan Steemann a231ab3d29 return HMAC as hex 2014-06-17 11:25:53 +02:00
Jan Steemann 70fec69952 added crypto.hmac function 2014-06-17 11:20:46 +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 a1177816aa modifiable AQL, final syntax 2014-06-17 00:37:08 +02:00
Jan Steemann ff494cc897 added recovery tests (not functional yet) 2014-06-16 16:52:26 +02:00
Jan Steemann 02d171412d 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-16 14:47:41 +02:00
Jan Steemann 2a0e0b18d0 added many tests 2014-06-16 14:39:26 +02:00
gschwab 7318417cf8 made make 2014-06-16 14:36:28 +02:00
gschwab 3943fdeb13 refactored orphan treatment for guacamole belongings 2014-06-16 14:16:21 +02:00
Jan Steemann b3d18d0deb cppcheck 2014-06-16 09:50:38 +02:00
Jan Steemann 964af24fe7 fixed compiler warnings 2014-06-14 01:49:17 +02:00
Jan Steemann 51cb9257e5 speed up string-buffer reusage by simplehttpclient 2014-06-14 01:24:43 +02:00
Jan Steemann af57d28711 cleanup 2014-06-13 21:59:09 +02:00
Jan Steemann 1a3dca4e78 cleanup 2014-06-13 21:40:58 +02:00
Jan Steemann 47999865d6 read-only mode 2014-06-13 15:32:13 +02:00
gschwab f067be5a97 orphan may only be added when not used in edge def 2014-06-13 13:56:39 +02:00
Jan Steemann fabc51f889 fixed wrong ASSERT usage 2014-06-13 12:10:35 +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
Max Neunhoeffer 53cebee93b Remove an unused "using namespace triagens;". 2014-06-12 16:28:07 +02:00
Max Neunhoeffer 369ea69d28 Take care of primitive shapes in LegendReader. 2014-06-12 16:04:32 +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
gschwab c46e0df090 added CRD for orphan collections of graphs 2014-06-12 15:28:35 +02:00
gschwab 17e850f646 fixed tests 2014-06-12 13:30:21 +02:00
gschwab d8bcfd3bbb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 11:36:39 +02:00
gschwab 7f9d3ffc03 fixed errors, added (standalone) vertex collection function for graphs 2014-06-12 11:36:29 +02:00
Jan Steemann dae5a5151d call (still empty) WAL recovery procedure at startup 2014-06-12 11:28:48 +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