1
0
Fork 0
Commit Graph

39691 Commits

Author SHA1 Message Date
jsteemann f40760c3b2 updated release notes 2017-05-08 22:21:05 +02:00
jsteemann e0ee287cf8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-08 22:06:11 +02:00
jsteemann fc0170f2a8 re-enable shared_from_this 2017-05-08 22:06:03 +02:00
jsteemann 6d80a77005 dont copy words 2017-05-08 22:05:40 +02:00
Andreas Streichardt 1a9d8e0298 Skip ssl stuff when not required 2017-05-08 20:40:44 +02:00
Andreas Streichardt 6ffd2f6da2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-08 20:33:20 +02:00
jsteemann 129abe71b5 mmh. did the previous change break the cluster? 2017-05-08 18:39:47 +02:00
Simon Grätzer a13614277d Added newline 2017-05-08 18:36:25 +02:00
Dan Larkin 5702e11bc5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-08 12:34:56 -04:00
Dan Larkin 4e70775ec9 Removed some hard-coded default options for RocksDB. 2017-05-08 12:34:51 -04:00
Simon Grätzer 1e3368c76a Preliminary changes 2017-05-08 18:27:51 +02:00
jsteemann 12b46d2086 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-08 18:27:07 +02:00
jsteemann 7577fed6fb added logger 2017-05-08 18:24:40 +02:00
Dan Larkin f6a20e1f41 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-08 12:09:10 -04:00
Dan Larkin 284bb6fb51 Fixed some issues with RocksDB passthrough options. 2017-05-08 12:08:41 -04:00
Wilfried Goesgens 905f1efb9c clean out the working directory for snap - just in case. 2017-05-08 18:02:28 +02:00
Jan Christoph Uhde cc51a10da2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  fix race
  try to detect situations where we need to invalidate the windows build directory
  fixing the fix
  fix indentation
  remove unnecessary includes
  fixing the fix
  remove obsolete comment
  oops more
  ooops left debug output behind
  Fixed header parsing in SimpleHttpClient for wrongly advanced cursor position in readBuffer
  Possibly too ambitious timing
  Windows warnings
  Docs: Fix link between Manual and AQL book
  The rocksdb cluster dump now tests Fulltext index as well
2017-05-08 18:00:39 +02:00
jsteemann 788fc07427 fix race 2017-05-08 17:57:42 +02:00
Simon Grätzer f62c99188c Seemingly functional geo index 2017-05-08 17:48:08 +02:00
Jan Christoph Uhde a4a04350a3 fix replication 2017-05-08 17:43:36 +02:00
Wilfried Goesgens b40fc1074d try to detect situations where we need to invalidate the windows build directory 2017-05-08 17:26:40 +02:00
Kaveh Vahedipour b517cfa2be Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-08 16:13:24 +02:00
Kaveh Vahedipour 3d1a5893fc fixing the fix 2017-05-08 16:13:05 +02:00
jsteemann 406bdeb3a1 fix indentation 2017-05-08 16:00:45 +02:00
jsteemann 2d1ed17a5d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-08 15:59:42 +02:00
jsteemann 37a6dd2a81 remove unnecessary includes 2017-05-08 15:59:33 +02:00
Kaveh Vahedipour 6c87bad730 fixing the fix 2017-05-08 15:59:26 +02:00
jsteemann 5e5aa50bb7 remove obsolete comment 2017-05-08 15:57:20 +02:00
Kaveh Vahedipour 5b32a8162d oops more 2017-05-08 15:56:35 +02:00
Kaveh Vahedipour 30179aff06 ooops left debug output behind 2017-05-08 15:53:10 +02:00
Kaveh Vahedipour 6d63f88464 ooops left debug output behind 2017-05-08 15:51:14 +02:00
Kaveh Vahedipour 61444b6154 Fixed header parsing in SimpleHttpClient for wrongly advanced cursor position in readBuffer 2017-05-08 15:46:45 +02:00
Jan Christoph Uhde acee270075 fix small bugs revealed by tests 2017-05-08 15:43:09 +02:00
Kaveh Vahedipour 2db7cfb299 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-08 15:22:59 +02:00
Kaveh Vahedipour 5400513087 Possibly too ambitious timing 2017-05-08 15:22:43 +02:00
Andreas Streichardt 6474c952a2 Windows warnings 2017-05-08 15:21:23 +02:00
Jan Christoph Uhde 8ee0406c64 move last logger creation to engines 2017-05-08 15:18:19 +02:00
Simon Grätzer 9098776589 Added geo index CRUD functionality 2017-05-08 14:49:58 +02:00
Simran Brucherseifer 5cdaad53a8 Docs: Fix link between Manual and AQL book 2017-05-08 14:14:38 +02:00
Simon Grätzer a610d81e3d fixing compiler warnings 2017-05-08 14:14:23 +02:00
Jan Christoph Uhde cf333f3b0a move creation of tickranges and first ticks into storage engines 2017-05-08 14:11:41 +02:00
Simon Grätzer 2aef42231e Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/rocksdb-geoindex 2017-05-08 13:41:12 +02:00
Simon Grätzer 7142bf2cfc Intermediate commit 2017-05-08 13:41:00 +02:00
Michael Hackstein 0b985cb9da Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-05-08 12:39:06 +02:00
Michael Hackstein 50cb7b8a84 The rocksdb cluster dump now tests Fulltext index as well 2017-05-08 12:39:00 +02:00
Jan Christoph Uhde bb4a0157ec Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  ttls are considered, when key-value store read is invoced
  ttls are considered, when key-value store read is invoced
2017-05-08 12:37:18 +02:00
Jan Christoph Uhde 13f2cd4cb9 change rocksdbkey for geoindex 2017-05-08 12:34:53 +02:00
Kaveh Vahedipour d149baa317 ttls are considered, when key-value store read is invoced 2017-05-08 12:22:14 +02:00
Kaveh Vahedipour 675e6599af ttls are considered, when key-value store read is invoced 2017-05-08 12:05:10 +02:00
Jan Christoph Uhde 80eae61afd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  Adding full text index to tests, and fixing some error handling
  fix wrong assertion
2017-05-08 12:04:57 +02:00