Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
34,953 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

4417 Commits

Author SHA1 Message Date
Frank Celler f559344034 added different path for different editions 2016-09-30 15:24:31 +02:00
Wilfried Goesgens daa5c9f6a5 make relative temporary paths absolute during the system startup. This fixes #1896 2016-09-27 16:19:13 +02:00
jsteemann b5c5407b02 try to fix compile warnings in non-maintainer mode 2016-09-27 13:31:17 +02:00
Michael Hackstein e16e6b6532 Templatified read and write locker. They can now use Cpp11 style locks. Also included distributeShardsLike in AgencyInformation about collections. 2016-09-26 18:29:51 +02:00
Frank Celler 0be25cf822 fixed clock_gettime under MacOS X 2016-09-26 14:55:10 +02:00
Michael Hackstein ac7e627f5b Merge branch 'devel' of github.com:arangodb/arangodb into hmh 2016-09-19 09:45:01 +02:00
jsteemann 501c368ae8 added experimental support for incoming gzip-compressed requests 2016-09-19 08:57:21 +02:00
Michael Hackstein 6e4f66c351 Merge branch 'devel' of github.com:arangodb/arangodb into hmh 2016-09-16 17:21:10 +02:00
Michael Hackstein 3e130c1cb4 Added a hash and equals comparator for velocypack that only takes _id into account. 2016-09-16 17:20:43 +02:00
jsteemann fad7efe8c3 more diagnostics 2016-09-16 09:35:08 +02:00
Wilfried Goesgens abd83047fe implement use-local-time for slow queries as sugested in #2051 2016-09-14 13:01:30 +02:00
Michael Hackstein 8dd3105762 Added a smartSearch route for Traversal Engines. In Community edition this will throw ONLY_ENTERPRISE. It should never be called by our code however. 2016-09-12 13:42:08 +02:00
Max Neunhoeffer d7ab888046 Cleanup hash function for attributes. Prepare enterprise. 2016-09-09 16:49:02 +02:00
Frank Celler 4cebbf985b changed dir structure 2016-09-09 15:08:48 +02:00
Frank Celler eed90fc588 fixed cppcheck warnings 2016-09-09 15:08:48 +02:00
jsteemann e08a2d0258 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-09 10:50:45 +02:00
jsteemann c4ca7ae2b5 make version details queryable via db._version() 2016-09-09 10:50:21 +02:00
Jan Christoph Uhde f4994993da fix return value with optional 2016-09-09 00:06:34 +02:00
Michael Hackstein d7b4ad5797 Fixed compile warning 2016-09-08 17:15:35 +02:00
Jan Christoph Uhde fc57c4809b Merge branch 'generic-col-types' of github.com:arangodb/arangodb into obi-velocystream 
* 'generic-col-types' of github.com:arangodb/arangodb: (168 commits)
  fix memleak
  Fixed shutdown of Traversal Blocks in Cluster
  restructuring agent wakeup
  remove visibility
  Traverser engine now unlocks all it's shards
  handle 0 values
  added HTTP REST APIs for online loglevel adjustments:
  move json-utilities to the place where it is solely used
  too verbose messages from cluster.js
  unify exception debugging
  Improved shutdown process of Graph Traverser Engines. This state causes a double free. Merge commit.
  silenced cppcheck warning
  silenced cppcheck warning
  silenced warning in maintainer-mode
  allow inline suppression
  give more debug info
  cosmetics
  properly free EngineInfo
  fix memleak
  fix some leaks
  ...
 2016-09-08 16:00:43 +02:00
Jan Christoph Uhde b560d15b72 prepare to send multiple chunks and do compression 2016-09-08 15:59:33 +02:00
jsteemann cb3d2eb6b9 Merge branch 'obi-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-08 13:58:36 +02:00
Jan Christoph Uhde b2762d6553 fix fullurl for vpp 2016-09-08 09:57:50 +02:00
jsteemann eea35223de move json-utilities to the place where it is solely used 2016-09-08 09:51:15 +02:00
jsteemann 34f7e27d6c Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-08 09:27:53 +02:00
Frank Celler 6abe3d9487 give more debug info 2016-09-08 08:40:29 +02:00
jsteemann a495dc9835 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 18:04:57 +02:00
Frank Celler 4cb7a787b1 added optional source directory 2016-09-07 17:00:00 +02:00
jsteemann 5807d121e6 added comments 2016-09-07 15:00:15 +02:00
Jan Christoph Uhde 7dc75a5b62 velocypack now tries to send more than one payload 2016-09-07 14:55:12 +02:00
Jan Christoph Uhde 8db47d507c Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream 
* 'obi-velocystream' of github.com:arangodb/arangodb:
  Remove _cookies
 2016-09-07 14:43:39 +02:00
Jan Christoph Uhde 99f592bae1 fix add multiple payloads for VppMessageNoOwnBuffer 2016-09-07 14:42:51 +02:00
Andreas Streichardt 695cf466e4 Remove _cookies 2016-09-07 14:35:13 +02:00
jsteemann 4e9028b883 removed unused member that triggered a compile error in clang 2016-09-07 14:32:41 +02:00
jsteemann 13a3470087 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 11:44:54 +02:00
jsteemann 9611f30796 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 11:44:49 +02:00
Kaveh Vahedipour 2499c3e2e8 typo 2016-09-07 11:12:53 +02:00
Kaveh Vahedipour 57453c96c5 Logging in cluster. No votes in constituent before vocbase != nullptr 2016-09-07 11:09:33 +02:00
jsteemann b8767c1bd8 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 08:54:02 +02:00
jsteemann f5a595f464 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 08:52:07 +02:00
Frank Celler 650b325529 shutdown thread that is not started directly 2016-09-06 23:20:23 +02:00
Kaveh Vahedipour 2840d4a002 try to fix the shutdown in thread 2016-09-06 18:32:46 +02:00
jsteemann b718f67ff6 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-06 14:40:51 +02:00
Kaveh Vahedipour 64887d6a86 agency tests wait for leadership to be established 2016-09-06 14:10:54 +02:00
Jan Christoph Uhde d0fdfa727a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into obi-velocystream 
* 'generic-col-types' of github.com:arangodb/arangodb:
  Improve version handling in ClusterInfo.
  Add further logging where a bug is likely.
  make error message unambiguous

Conflicts:
	lib/Rest/HttpResponse.cpp
 2016-09-05 16:42:41 +02:00
Jan Christoph Uhde cbd8ce615a make use of requested content type 2016-09-05 15:32:56 +02:00
Max Neunhoeffer ea82514b5e Merge branch 'generic-col-types' of ssh://github.com/ArangoDB/ArangoDB into generic-col-types 2016-09-05 14:07:00 +02:00
Max Neunhoeffer 6da79bf031 Merge branch 'generic-col-types' of ssh://github.com/ArangoDB/ArangoDB into generic-col-types 2016-09-05 14:06:54 +02:00
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
Max Neunhoeffer 2543091b7c Add further logging where a bug is likely. 2016-09-05 14:00:25 +02:00
Jan Christoph Uhde a53554dcd4 Merge remote-tracking branch 'origin/generic-col-types' into obi-velocystream 
* origin/generic-col-types: (124 commits)
  fixed invalid read
  fixed index creation & validation
  Added missing classes
  micro optimizations
  Added a try catch in loadPlan. If the agency for some reason contains invalid collection information the coordinator will not break down, instead it will ignore the invalid collection and continue.
  looks good for dangling creation of shards
  respond with proper error message in case queue is full
  fix invalid check
  fixed figures() call
  half way through unassumed leadership
  prealloc _readBuffer
  fixed compile warning
  work less on the heap
  removed unused error codes
  removed TRI_collection_t
  removed bug into failedserver
  Create apps directory before starting the instance.
  Add instance info & port sniffing template
  fixed issue #2034
  privatized some members
  ...

Conflicts:
	lib/Rest/HttpResponse.cpp
 2016-09-05 13:29:39 +02:00
Jan Christoph Uhde 7ffa6ae9db fix invalid pointer 2016-09-05 12:12:29 +02:00
Jan Christoph Uhde dd500d9b9f fix warning 2016-09-05 12:07:42 +02:00
jsteemann 62718e0962 fixed invalid read 2016-09-05 12:03:43 +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
jsteemann a7cee1490a fix some shutdown issues 2016-09-01 17:43:32 +02:00
jsteemann 69bfca08ca Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 15:39:11 +02:00
jsteemann 6b376fe3e1 a bit less locking 2016-09-01 15:25:19 +02:00
Jan Christoph Uhde ee10949dcf fix cursor test for vpp 2016-09-01 12:12:28 +02:00
jsteemann 68ae8d2945 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 12:02:50 +02:00
Jan Steemann d57c3ef792 removed unused method 2016-09-01 12:02:24 +02:00
Jan Christoph Uhde 5092c08e6d fix requests where nobody is available 2016-09-01 11:28:46 +02:00
Jan Steemann a2f0b0a49f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-01 11:20:15 +02:00
Jan Steemann e03d550985 removed unused methods 2016-09-01 11:19:55 +02:00
jsteemann be820ac927 fix freeing of nullptr 2016-09-01 08:42:17 +02:00
jsteemann 149ef4ab8b fix freeing of nullptr 2016-09-01 08:39:44 +02:00
Jan Christoph Uhde 59ad47d717 make more efficient use of setPayload 2016-08-31 18:22:13 +02:00
jsteemann fa21e70256 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 17:59:54 +02:00
jsteemann 2d1e0bd3ae fixed some leaks 2016-08-31 15:30:47 +02:00
Jan Christoph Uhde 63fa20fb42 Merge remote-tracking branch 'origin/devel' into obi-velocystream-try-merge-devel 
* origin/devel:
  don't leak on help
  Abort compilation process if the cmake configure run fails
  || exit 1
  Handle 503 answer from dbservers properly
  return service unavailable during shutdown
  Add cxgcc snippets
  fix users home directory.
  Fix debian scripted password documentation.
  slighty improved error handling in import API
  fixed issue #2026
  Fix release matching for alpha/beta versions
  We mustn't use minuses in the releases since that will collide later on with packaging.
  Pass arguments along to build.sh
  Fix windows NSIS client package
  fix typo
  - properly use armhf for armv7 packages - specify CPACK_DEBIAN_PACKAGE_ARCHITECTURE so one can cx-compile packages.

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	lib/Rest/FakeRequest.cpp
 2016-08-31 15:06:27 +02:00
Jan Christoph Uhde f09bf540bc change setPayload and add requested ContentType in response 2016-08-31 14:32:04 +02:00
jsteemann 89ac2dfba5 don't leak on help 2016-08-31 14:28:23 +02:00
Andreas Streichardt a14935aca3 Handle 503 answer from dbservers properly 2016-08-31 11:24:23 +02:00
jsteemann c8ee419a80 fix calls 2016-08-31 11:23:48 +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 a04934ce50 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 09:25:09 +02:00
Jan Christoph Uhde ed111a39a1 Merge branch 'devel' into obi-velocystream-try-merge-devel 
* devel: (24 commits)
  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.
  fix CMake so it finds the PythonInterpreter even with oder versions
  hexify corrupted markers
  Fix comments
  fixed cluster start
  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
  fix perfsetupscript
  clean up perf script
  add SYSTEM flag to boost includes to avoid warnings
  Adding Foxx access to agency
  Adding Foxx access to agency
  fix compile warning
  Add missing windows library.
  fix windows compile problems.
  Fix syntax error in windows client installer.
  If we have relative paths that are working, make them absolute so they still work after CWD's of arangod
  ...

Conflicts:
	arangod/Agency/AgentConfiguration.cpp
	arangod/GeneralServer/HttpCommTask.cpp
	arangod/RestServer/DatabaseFeature.cpp
	arangod/VocBase/datafile.cpp
 2016-08-30 22:04:31 +02:00
jsteemann 9b94287fb7 unify id handling? 2016-08-30 16:07:35 +02:00
jsteemann 61d11fd71c acquire lock later 2016-08-30 13:00:17 +02:00
jsteemann bc9d0e74d5 unprepare features on abort 2016-08-30 12:59:15 +02:00
jsteemann 5964ffce78 fixed some tests 2016-08-30 09:36:43 +02:00
Jan Christoph Uhde d8be2b4079 fix: RestcursorHandler 2016-08-29 20:33:37 +02:00
jsteemann 9e708112a6 privatize some TRI_datafile_t internals 2016-08-29 15:43:03 +02:00
Jan Christoph Uhde 656ceb873d add vpack version of cursor.dump() 2016-08-29 14:20:42 +02:00
jsteemann 8fac72e8d6 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-29 12:52:47 +02:00
Simran Brucherseifer dc8ced3a9b Fix comments 2016-08-29 11:52:09 +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
jsteemann 37258adb57 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 16:37:25 +02:00
Kaveh Vahedipour 0b8b56a54a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-26 16:25:17 +02:00
Kaveh Vahedipour e07543c2e2 Adding Foxx access to agency 2016-08-26 16:25:03 +02:00
jsteemann 50d4d5493c Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 15:32:24 +02:00
jsteemann 4f994f70b5 fix compile warning 2016-08-26 15:31:57 +02:00
jsteemann 598990eb5c Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 15:27:37 +02:00
Wilfried Goesgens 1a4675865e Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-26 14:55:48 +02:00
jsteemann 0fe0e89a89 invalidate bucket data 2016-08-26 14:53:37 +02:00
jsteemann 4727c833c8 fixed some leaks 2016-08-26 14:29:31 +02:00
Wilfried Goesgens 1de83c020d fix windows compile problems. 2016-08-26 14:17:28 +02:00
Jan Christoph Uhde b30c3f8e85 Merge branch 'obi-velocystream' into obi-velocystream-agent 
* obi-velocystream:
  fix CMake so it finds the PythonInterpreter even with oder versions
  added unload() functionality for indexes (untested)
  Adding Foxx access to agenc
 2016-08-26 14:09:38 +02:00
jsteemann a31fe62c34 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 14:02:27 +02:00
jsteemann 22b1b7b7e7 added unload() functionality for indexes (untested) 2016-08-26 14:00:03 +02:00
jsteemann 4b53310189 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 13:42:40 +02:00
Kaveh Vahedipour b409a1ff25 Adding Foxx access to agenc 2016-08-26 13:35:39 +02:00
Jan Christoph Uhde c2e2ff6744 Merge branch 'obi-velocystream' into obi-velocystream-agent 
* obi-velocystream:
  undo simrans change - building on linux works again
  added assertions to prevent buffer overruns
  moved _compactionLock out of TRI_collection_t
  cmake: don't allow Python 3 interpreter (gyp only works with Python 2)
  updated CHANGELOG
  throw OOM error in case no buffer can be allocated
  add note about potential performance issues
 2016-08-26 13:16:14 +02:00
Michael Hackstein 0985e7fc88 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 12:52:41 +02:00
Wilfried Goesgens 3d6810ecfe If we have relative paths that are working, make them absolute so they still work after CWD's of arangod 2016-08-26 12:50:48 +02:00
jsteemann 8a6d054642 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 12:37:07 +02:00
Michael Hackstein 1c883a811c Potential fix for unload->load. Needs to be validated. 2016-08-26 12:35:33 +02:00
jsteemann 08f1fa3a22 added assertions to prevent buffer overruns 2016-08-26 12:04:28 +02:00
Jan Christoph Uhde 221b35267c Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-agent 
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (29 commits)
  removed define that was used only once
  fix dumping of VPackSlices without CustomTypeHandler
  remove includes
  add no-throttling hint for compactor, too
  remove function pointers from TRI_datafile_t, added constructor and destructor
  moved functionality into engine
  fixed tests
  finalize classes
  fix agency shutdown
  cppcheck
  cppcheck
  fix agency shutdown
  removed unused file
  more diagnostic output
  issue #2006: added more diagnostic output for some replication errors
  allow dropping system collections in some rare cases
  updated CHANGELOG
  fixed issue #2012
  explain why we fail to fetch the git revision.
  Cleanup cmake process so it doesn't barf on problems to detect the git version.
  ...
 2016-08-26 11:47:23 +02:00
jsteemann 9ae2cb36e9 fix dumping of VPackSlices without CustomTypeHandler 2016-08-26 10:51:54 +02:00
Michael Hackstein b01a7ac0d5 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 08:02:54 +02:00
Wilfried Goesgens d37c9a751f fix syntax :-( 2016-08-25 17:50:08 +02:00
Wilfried Goesgens f39ec1c591 Windows install: no backslash strings in cmake. 2016-08-25 17:35:29 +02:00
Michael Hackstein 7d6402b15c Fixed soem crashes and undefined behaviuor. Server does not crash during tests, however a lot of them are still red 2016-08-25 14:51:03 +02:00
jsteemann 4020d8f2e9 finalize classes 2016-08-25 14:25:17 +02:00
jsteemann 85db0a062a removed unused file 2016-08-25 14:03:54 +02:00
Jan Christoph Uhde 2ba4901b86 fist changes to get request agents working 2016-08-25 13:28:19 +02:00
Michael Hackstein e1ac5175b1 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-25 11:09:11 +02:00
Michael Hackstein 1f3dabc8e1 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-25 11:08:39 +02:00
jsteemann 22d3a1eb9a Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 10:41:09 +02:00
jsteemann f4aa60ed0d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 10:38:26 +02:00
Jan Christoph Uhde c64ebd6660 fix missing return in control path 2016-08-25 10:36:12 +02:00
Wilfried Goesgens 4939e02fb2 Make the existance of the database directory non-mandatory again. 2016-08-25 10:07:37 +02:00
Michael Hackstein 2af30f056d Moved index creation to use LogicalCollection instead of TRI_collection_t. Involved changes of the constructor, all can now be created using iid and Slice. Removed specialized functions to create/find indixes in v8-voc index. Also the iteration is modified. This commit compiles but tests will fail. Merge commit. 2016-08-25 09:57:36 +02:00
Jan Christoph Uhde dbe3caa46f Merge branch 'obi-velocystream' into engine-vs-velocystream 
* obi-velocystream:
  fix adding to array (without keys:)
  fix header access
  VPP Header is now and Array instead of Object
 2016-08-25 08:51:44 +02:00
jsteemann 1dab450622 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:35:10 +02:00
jsteemann 07055384b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:34:59 +02:00
jsteemann 04f5fbbdb2 fixed issue #2018 2016-08-24 17:33:49 +02:00
Jan Christoph Uhde c67f45a9ce fix adding to array (without keys:) 2016-08-24 16:31:08 +02:00
Jan Christoph Uhde ca433a92fd VPP Header is now and Array instead of Object 2016-08-24 15:51:44 +02:00
Jan Christoph Uhde f9feb14a6e Revert "Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream" 
This reverts commit 76679e1636, reversing
changes made to 5be5030983.

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-24 15:26:49 +02:00
Jan Christoph Uhde e0d914fcc1 Revert "add options to Slice::get and use them for VPackHeader" 
This reverts commit b2f99adaaa.
 2016-08-24 15:11:22 +02:00
Wilfried Goesgens 1688655509 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-24 14:46:48 +02:00
Wilfried Goesgens 1f162ac882 Implement scheme to more clever pass the directories from the build process to the run-time 
We will now try to evaluate the toplevel install directory from the configured binary dir.
We will use this toplever directory when searching for other directories.
 2016-08-24 14:45:08 +02:00
Jan Christoph Uhde df0d080512 Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream 
* origin/engine-vs-velocystream:
  fix compile errors after merge
  fix collector inactivity in shutdown
  grunt
  Attempt not to bypass error handling so we hopefully get some more information on issue #2011
  updated agency pool
  fixed wrong default values for _sslOptions
  validate default value for DiscreteValuesParameter
  Coorect agency path (no more / duplicates)
  Better shutdown handling
  change build output name once more.
  I love you too, Richard.
  Add uname -o to the filename to make shure build pipelines pick the right ones.
  weekend edition
  gv improvements
 2016-08-24 14:18:10 +02:00
jsteemann f92815b09b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-24 09:38:06 +02:00
Jan Christoph Uhde 76679e1636 Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream 
* obi-velocystream-attribute-translator:
  add options to Slice::get and use them for VPackHeader
  add translator to VelocyPackHelper and headerOption to Vpp Protocol

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
	lib/Rest/CommonDefines.h
 2016-08-24 09:18:35 +02:00
Jan Christoph Uhde 5be5030983 Merge branch 'obi-velocystream-enums' into engine-vs-velocystream 
* obi-velocystream-enums:
  clean up - remove enumToEnum magic
  finish ResponseCode enum
  finish  ProtocolVersion, ProtocolType and ConnectionType
  finish ContentType enum
  preapre move of ContentTypes
  finish RequestType enum
  prepare replacement of request types
  even more error messages
  slightly better error messages
  better exceptions form event loop
  mark len constexpr

Conflicts:
	arangod/Agency/Inception.cpp
 2016-08-23 16:01:58 +02:00
Jan Christoph Uhde 0184399ba7 clean up - remove enumToEnum magic 2016-08-23 15:58:50 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde a6f5fc97de finish ProtocolVersion, ProtocolType and ConnectionType 2016-08-23 15:36:36 +02:00
Jan Christoph Uhde 4873a9be71 finish ContentType enum 2016-08-23 15:02:55 +02:00
Jan Christoph Uhde 140b8dc802 preapre move of ContentTypes 2016-08-23 14:55:34 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
jsteemann 85cb227a4f fixed wrong default values for _sslOptions 2016-08-23 14:34:05 +02:00
jsteemann 50ced553b8 validate default value for DiscreteValuesParameter 2016-08-23 14:33:48 +02:00