1
0
Fork 0
Commit Graph

23 Commits

Author SHA1 Message Date
jsteemann f573f188dc Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 14:02:57 +02:00
Jan Christoph Uhde dd500d9b9f fix warning 2016-09-05 12:07:42 +02:00
jsteemann df808cd665 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:51:09 +02:00
jsteemann 5e9cb5c852 removed unused error codes 2016-09-02 15:36:59 +02:00
Jan Christoph Uhde f09bf540bc change setPayload and add requested ContentType in response 2016-08-31 14:32:04 +02:00
Jan Christoph Uhde d6a1f45b1b Merge branch 'obi-velocystream' into obi-velocystream-stupid
* obi-velocystream: (34 commits)
  add flags only for gcc as they are meaningless for clang
  update my scripts
  renamed method
  fixed some tests
  fix RestExportHandler
  fix: RestcursorHandler
  minor fixes
  fix effect that on second install we will complain about mismatching passwords
  only test for cleaning up 3rdparty if we're parametrized to do so.
  add vpack version of cursor.dump()
  fix CMake so it finds the PythonInterpreter even with oder versions
  hexify corrupted markers
  Fix comments
  fixed cluster start
  some preparation work for response generalization
  removed obsolete comment
  use Buffer.append() instead of memcpy
  issue #2022: double max allowed request body size, cap --batch-size value in arangoimp
  fixed issue #2023: added replicationFactor to docs
  improve the perf script
  ...

Conflicts:
	lib/Rest/GeneralResponse.cpp
	lib/Rest/GeneralResponse.h
2016-08-31 11:21:27 +02:00
jsteemann ae52fa028d use Buffer.append() instead of memcpy 2016-08-29 10:06:46 +02:00
Jan Christoph Uhde bc09a69c72 optimization that skips the body of addPayload used in http case
tests - fail
2016-08-27 03:07:48 +02:00
Jan Christoph Uhde c31b93647a try to fix RestCursorHandler 2016-08-27 02:01:18 +02:00
Jan Christoph Uhde 3d26df27a0 prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde 9ba13e757c prepare response for multiple velocypacks 2016-08-19 09:38:35 +02:00
Jan Christoph Uhde 3d4e1f6922 clean up code 2016-08-11 16:44:12 +02:00
jsteemann bfd5596359 optimizations 2016-05-11 11:50:07 +02:00
Jan Steemann 0bd61cf928 removed option `--server.default-api-compatibility` 2016-05-06 18:38:37 +02:00
jsteemann 0dc068a5be Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-01 00:07:55 +02:00
jsteemann 1250fcf63e micro optimizations 2016-05-01 00:03:23 +02:00
Frank Celler 603aa4bfde removed unused code 2016-04-30 21:00:24 +02:00
Jan Steemann ac99d29dd4 fixed misusage 2016-04-07 16:39:53 +02:00
Jan Steemann 4b0c01975b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:30:36 +02:00
Frank Celler f6c818a399 removed tolower for NC 2016-04-07 14:15:30 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00