1
0
Fork 0
Commit Graph

39481 Commits

Author SHA1 Message Date
baslr 3ef9c664b8 ldap documentation fixes 2017-04-21 16:11:34 +02:00
Kaveh Vahedipour 2163055175 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-21 16:10:24 +02:00
Michael Hackstein 3b34d4edec Unified static-counting for Traversals on the Cache 2017-04-21 15:58:44 +02:00
baslr 8fc0500ffd Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-21 15:58:25 +02:00
Wilfried Goesgens bc57289cfd add missing files for ArangoDBStarter documentation 2017-04-21 15:57:28 +02:00
baslr f4b349b954 rename missing documentation files 2017-04-21 15:54:17 +02:00
baslr d6cc45a7e6 added missing files 2017-04-21 15:49:59 +02:00
Kaveh Vahedipour d5a8269d57 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-21 15:47:09 +02:00
Kaveh Vahedipour 42caf5044c merge in cpp & js from 3.1.18 yet to do tests 2017-04-21 15:47:03 +02:00
baslr bb41af05ad Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-21 15:43:46 +02:00
Kaveh Vahedipour 1f81ce28b0 merge in cpp & js from 3.1.18 yet to do tests 2017-04-21 15:41:05 +02:00
jsteemann dbe5aec4aa Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 15:31:13 +02:00
jsteemann efefb87d70 jslint 2017-04-21 15:30:53 +02:00
baslr 9cb791cd11 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-21 15:29:54 +02:00
jsteemann 03585460a8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 15:28:45 +02:00
jsteemann 361d513087 re-enable user settings for RocksDB 2017-04-21 15:28:29 +02:00
Wilfried Goesgens 3a1e65d53f add test whether append to NULL works 2017-04-21 15:23:54 +02:00
baslr e275112601 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-21 15:20:39 +02:00
jsteemann 62d0bb36d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 15:17:43 +02:00
Wilfried Goesgens 5125f3e70a fix snap package filename 2017-04-21 15:13:14 +02:00
Wilfried Goesgens 2b77bfcaaa fix snap package filename 2017-04-21 15:13:01 +02:00
Michael Hackstein e46642fce1 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 15:06:42 +02:00
Michael Hackstein aa2abe0c1d Fixed a bug in TraverserOptions when using more than one edge collection and a specific filter on depth. 2017-04-21 15:06:24 +02:00
Wilfried Goesgens cb54938582 also try to detect the icu database in its absolute install directory 2017-04-21 14:22:56 +02:00
jsteemann 0444a5a068 disable usage of (bad) default values 2017-04-21 14:02:50 +02:00
baslr 8749276b02 include ldaplib if enterprise 2017-04-21 13:58:58 +02:00
jsteemann 59ee7e821b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 13:42:04 +02:00
Wilfried Goesgens 1f1611a278 fix the location for README and LICENSE - remove wrong escape 2017-04-21 13:25:39 +02:00
Wilfried Goesgens 5ef33d1467 fix the location for README and LICENSE 2017-04-21 13:24:18 +02:00
Wilfried Goesgens 3d418362d2 respect the install prefix for the systemd unit file anyways. 2017-04-21 13:23:50 +02:00
jsteemann b33390c1d4 remove log spam 2017-04-21 13:21:38 +02:00
Simon Grätzer ff4f8181dd Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 13:00:36 +02:00
Simon Grätzer 235f006a27 const collection CRUD methods 2017-04-21 13:00:30 +02:00
Simon Grätzer 064c51c731 Adding const statements 2017-04-21 12:59:20 +02:00
jsteemann 862ec7bae3 remove log garbage 2017-04-21 12:57:20 +02:00
jsteemann 9d6277689c change default value for `--ssl.protocol` from 4 (TLSv1) to 5 (TLSv12) 2017-04-21 12:49:16 +02:00
jsteemann 691dac7a73 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 12:35:07 +02:00
Kaveh Vahedipour 020277caf3 cherry pick of 2e7924e74a from 3.1 2017-04-21 11:50:42 +02:00
Kaveh Vahedipour 2dbd179656 Fix ocasionally hangling shut down on mac 2017-04-21 11:49:22 +02:00
baslr 76eeef7bd0 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-21 11:37:45 +02:00
Michael Hackstein 44ef7e9627 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-21 11:31:55 +02:00
Michael Hackstein e3beaaa8fc Added a test + fix for a Stackoverflow issue in Traversals and ShortestPath in AQL. This occured in the case where there are a lot of starting vertices in a row that do not have any paths attached to them. Fixes: #2445 2017-04-21 11:31:30 +02:00
Wilfried Goesgens 93d6b7f058 add ArangoDBStarter article, move detail articles into submenu layers 2017-04-21 11:12:14 +02:00
jsteemann 5d86a729c0 fix dump format 2017-04-21 11:09:06 +02:00
jsteemann d489934df2 remove unused include 2017-04-21 10:27:11 +02:00
jsteemann 498ace382a remove debug log messages 2017-04-21 10:00:39 +02:00
jsteemann 618544a745 remove unused include 2017-04-21 10:00:27 +02:00
Dan Larkin 30efe6c136 Made more progress on dump tests. 2017-04-20 23:05:56 -04:00
Dan Larkin c46d4c6a6f Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 18:04:36 -04:00
Dan Larkin 9d6aa4b297 Some more replication handler changes. 2017-04-20 18:04:33 -04:00