1
0
Fork 0
Commit Graph

22717 Commits

Author SHA1 Message Date
Max Neunhoeffer f7126d4974 Fix a typo. 2015-08-21 16:21:18 +02:00
Max Neunhoeffer 1dce162b4b Merge branch 'array_indexing' of ssh://github.com/ArangoDB/ArangoDB into array_indexing
Conflicts:
	arangod/Indexes/HashIndex.cpp
2015-08-21 16:11:28 +02:00
Max Neunhoeffer 479f81f760 Buckets for hash-array, also C++-ize it. 2015-08-21 16:05:17 +02:00
Jan Steemann 31a6547d4c fix replication resumption 2015-08-21 15:57:24 +02:00
Michael Hackstein b708a7ae68 Merge remote-tracking branch 'origin/devel' into array_indexing 2015-08-21 15:34:49 +02:00
Michael Hackstein c26be36e61 Added tests for Sparse indexes 2015-08-21 15:04:01 +02:00
Michael Hackstein 85b58a6d8d Fixed sparse indexes 2015-08-21 14:07:32 +02:00
Michael Hackstein 9bb7c0dec6 The skiplist index is now able to index arrays as well 2015-08-21 11:04:04 +02:00
Jan Steemann 20af58dd09 Merge branch 'devel' of https://github.com/arangodb/arangodb into replication 2015-08-21 09:30:16 +02:00
Willi Goesgens 25fb1c3e6f Merge pull request #1450 from CoDEmanX/devel
Make version more prominent in documentation
2015-08-21 09:29:41 +02:00
CoDEmanX 183adccbd9 Make version more prominent in documentation
Many ebook readers (and reading apps) generate covers from meta data like the book title. Therefore it makes sense to place the version string there instead of the first paragraph.
2015-08-21 00:18:32 +02:00
Jan Steemann f5e5977eca colors only for ttys 2015-08-20 22:26:39 +02:00
Jan Steemann 8ee12f7a27 binary-safe back-references 2015-08-20 21:01:43 +02:00
Jan Steemann 82ba366eef removed non-existing paths 2015-08-20 20:39:53 +02:00
Jan Steemann bd3449ad1d updated documentation 2015-08-20 20:35:28 +02:00
Jan Steemann ffde050e0d check for empty collections list 2015-08-20 20:25:01 +02:00
Willi Goesgens b785c44a5d fix docublock syntax. 2015-08-20 18:30:30 +02:00
Jan Steemann f0ef3d450f refactoring 2015-08-20 18:25:47 +02:00
Michael Hackstein a2d26056b2 Added a test file for array indexing 2015-08-20 15:48:11 +02:00
Jan Steemann 82f2f07346 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-20 15:32:27 +02:00
Michael Hackstein 8491d84c96 Added forgotten header file for last commit 2015-08-20 15:27:49 +02:00
Michael Hackstein 838a91b125 Fixed rollback for insertion of multiple elements. Is now able to define a unique constrain on array entries 2015-08-20 15:13:56 +02:00
Michael Hackstein cd5fe6aceb Removed debug output 2015-08-20 15:11:18 +02:00
Willi Goesgens 6b575c96d9 Add the version into the body of the document, since the header isn't rendered into pdf & ebook. 2015-08-20 14:34:25 +02:00
Michael Hackstein 4bb8508d82 Implemented a new improved version of the Array index insertion function. 2015-08-20 14:03:17 +02:00
Jan Steemann f9167b0b69 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-20 12:00:32 +02:00
Jan Steemann 2068136118 updated CHANGELOG 2015-08-20 12:00:25 +02:00
Willi Goesgens 61eb1e6002 Fix vs 2015 compile issue. 2015-08-20 11:34:01 +02:00
Willi Goesgens 7b41912489 Merge pull request #1448 from CoDEmanX/devel
Fixes for Windows (.sh line endings, ignored files, remove bad file)
2015-08-20 09:37:31 +02:00
CoDEmanX f35bd8728f Fix target path for js files
Folder must be omitted from destination path, or a another folder will be created as parent and break file structure.
2015-08-20 03:23:14 +02:00
Jan Steemann deb7830615 fix dump/restore filenames 2015-08-20 02:47:00 +02:00
Jan Steemann 4b7d04de47 added missing whitespace 2015-08-20 01:46:21 +02:00
Jan Steemann 97d67e4399 use binary-safe string representations 2015-08-20 01:46:20 +02:00
Jan Steemann 1be3733a64 moved some handlers around
fix disappeared handlers
2015-08-20 01:26:52 +02:00
Jan Steemann ea382e1f4c removed triagens::rest::Handler 2015-08-20 01:26:50 +02:00
CoDEmanX 622fee5f1a Prevent git from changing line endings from LF to CRLF for shell scripts.
It would break them over and over again on Windows (strange syntax errors in bash).
2015-08-19 23:29:55 +02:00
CoDEmanX fcf6576674 Ignore diffs, patches and Windows libs 2015-08-19 23:19:36 +02:00
CoDEmanX 49fcde5872 Fix #1447: remove invalid/empty file 2015-08-19 23:17:25 +02:00
Willi Goesgens f02ecbf3b9 by CoDEmanX: fix windows build for the non-express Visual Studios 2015-08-19 20:56:16 +02:00
Jan Steemann c5f36e6cd5 fixed forward declaration 2015-08-19 17:54:06 +02:00
Jan Steemann 0e3fddf917 fixes for VS2015 2015-08-19 17:18:13 +02:00
Jan Steemann 4e595fda13 simplifications 2015-08-19 17:18:05 +02:00
Jan Steemann f587b2ca6a replication refactoring 2015-08-19 16:13:53 +02:00
Jan Steemann 878641f674 some replication refactoring 2015-08-19 15:32:24 +02:00
Michael Hackstein 5049c1dd23 Fixed CLANG compiler warnings in UnitTests 2015-08-19 15:25:41 +02:00
Max Neunhoeffer 844e028389 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-08-19 14:46:28 +02:00
Max Neunhoeffer ff135a10ad Add some overrides to silence a clang compiler warning. 2015-08-19 14:46:06 +02:00
Willi Goesgens 18db6faadb by CoDEmanX: fix relative path calculation. 2015-08-19 14:33:28 +02:00
Jan Steemann 90dafd61c0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-19 13:11:52 +02:00
Jan Steemann caeab34b06 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-19 13:10:12 +02:00