* fix some deadlocks found by evil lock manager (tm)
* fix duplicate lock
* fix indentation
* ensure proper lock dependencies
* fix lock acquisition
* removed useless comment
* do not lock twice
* create either a V8 transaction context or a standalone transaction context, depending on if we are called from within V8 or not
* AQL micro optimizations
* use explicit constructor
* only use V8DealerFeature's ConditionLocker for acquiring a free V8 context
entering and exiting the selected context is then done later on without having to hold the ConditionLocker
* remove some recursive locks
* Disable custom deadlock detection when Thread Sanitizer is enabled
* Changing ifdef's
* grr
* broke gcc
* Using atomic for ApplicationServer::_server
* fix premature unlock
* add some asserts
* honor collection locking in cluster
* yet one more lock fix
* removed assertion
* some more bugfixes
* Fixing assert
(cherry picked from commit 1155df173bfb67303077fbe04ee8d909517bfd21)
* do not use V8 variant of AQL functions in early optimization stage when a C++ variant is available
* additionally, simplify AQL function definitions and aliases
* warn when more than 90% of max mappings are in use
* added C++ variant of replication catchup
* added `--log.role` option
* updated CHANGELOG
* removed non-existing scheduler.threads option from config
* removed useless __FILE__, __LINE__ invocations
* updated CHANGELOG
* allow a priority V8 context
* remove TRI_CORE_MEM_ZONE
* try to fix Windows errors & warnings
* cleanup
* removed memory zones altogether
* exclude system collections from collection tests
* Get rid of a compiler warning in community edition.
* Teach /_api/replication/clusterInventory to report Plan/Version and readiness.
This is first implemented in the ClusterInfo library.
Then the clusterInventory code uses it and checks readiness.
Readiness of a collection means that it is created and all shards
and all replications have been created and are in sync.
* Added a backup test suite. This suite is supposed to entirely drop an ArangoDB _system and restore it into a fresh one. This also includes system collections.
* Added more test cases for backup suite. Now tests several authorization/rights cenarios
* Fixed RestReplication Handlers to restore _user collections Properly.
* Updated Changelog
* Added special handling of _users in Restore for MMFiles as well.
* Added JWT secret for cluster execution of this test, also added JWT secret to shutdown call
* 'engine-api' of https://github.com/arangodb/arangodb: (46 commits)
Merged RocksDBPathBasedIndex into RocksDBVPackIndex.
fix handling of externals
fix toArray()
fix returning documents
Added hash-, skip list, persistent indexes
harmonize filtering - filter on full filename.
mini modifications
standardize starting of servers for replication tests
Edge index compliant with design doc
another fix for #2404
Moved „removeLargeRange“ method to commons
Added length byte to IndexValue keys.
fixed issue #2404
Added drop to primary index
Added drop() to indexes
Fixes a coordinator crash in Clustered Traversal. In case of failover during query planning.
Fixed edge index
Expand on CORS documentation
Let ArangoDB handle the allow-credentials header
make the authentication tests run on directories
...
this changes the server startup option `--database.check-30-revisions` from a boolean (true/false)
parameter to a string parameter with the following possible values:
- "fail":
will validate _rev values of 3.0 collections on collection loading and throw an exception when invalid _rev values are found.
in this case collections with invalid _rev values are marked as corrupted and cannot be used in the ArangoDB 3.1 instance.
the fix procedure for such collections is to export the collections from 3.0 database with arangodump and restore them in 3.1 with arangorestore.
collections that do not contain invalid _rev values are marked as ok and will not be re-checked on following loads.
collections that contain invalid _rev values will be re-checked on following loads.
- "true":
will validate _rev values of 3.0 collections on collection loading and print a warning when invalid _rev values are found.
in this case collections with invalid _rev values can be used in the ArangoDB 3.1 instance.
however, subsequent operations on documents with invalid _rev values may silently fail or fail with explicit errors.
the fix procedure for such collections is to export the collections from 3.0 database with arangodump and restore them in 3.1 with arangorestore.
collections that do not contain invalid _rev values are marked as ok and will not be re-checked on following loads.
collections that contain invalid _rev values will be re-checked on following loads.
- "false":
will not validate _rev values on collection loading and not print warnings.
no hint is given when invalid _rev values are found.
subsequent operations on documents with invalid _rev values may silently fail or fail with explicit errors.
this setting does not affect whether collections are re-checked later.
collections will be re-checked on following loads if `--database.check-30-revisions` is later set to either `true` or `fail`.
The change also suppresses warnings that were printed when collections were restored using arangorestore, and the restore
data contained invalid _rev values. Now these warnings are suppressed, and new HLC _rev values are generated for these documents
as before.
Squashed commit of the following:
commit 946c37a9247fc2c5bafb91d8ffd8d62096376214
Merge: 6b1957c 52877d3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Oct 13 14:03:31 2016 +0000
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'devel' of github.com:arangodb/arangodb:
More logging of _role and _leaderID changes in agency.
queryView #2111
Better logging of redirects.
Automate mac build - DRY for prefixes, directories etc. - possibility to provide build.sh with the prefix
try to locate brew installations of openssl
More logging in redirect case in AgencyComm.
css
ui query profiling
Added Documentation for SmartGraphs via HTTP.
return meaningful error message
grunt build
queryview bugfix
typo
fixed collection create bug
typo
Fixed JS syntax bug in gharial module
added shards keys to coll. info view
Conflicts:
Installation/Jenkins/build.sh
commit 6b1957c84276792c3ee32ec97ab5e943910498ec
Merge: 7235be0 79c0f54
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Oct 13 11:28:33 2016 +0000
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'devel' of github.com:arangodb/arangodb:
Add more logging about shard creation/dropping/cleaning.
commit 7235be03b8152227e7b315045d90d9b995cd3036
Merge: ddbd020 c576426
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Oct 13 11:02:51 2016 +0000
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'devel' of github.com:arangodb/arangodb:
Increase some timeouts from 60 to 90s to be more load tolerant.
commit ddbd0209ddbf0a2ed535c385ed0787533ed6c284
Merge: a5bf367 f949b49
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Oct 13 10:17:36 2016 +0000
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'devel' of github.com:arangodb/arangodb:
Fix a typo.
left-align table headers in query result view
Work on the macos Bundle scripts
commit a5bf367b72f2679aa8ba83a2cd509028b6b6e924
Merge: 56aef8f a5e51e5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Oct 13 10:17:12 2016 +0000
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'devel' of github.com:arangodb/arangodb: (30 commits)
Further fixes in gharial for SmartGraph support.
Increase timeout to test ttl.
fix typo
Fix AQL REPLACE for smart edges.
semistandard
Fix performRequests?
Adjust comments about TRI_usleep and usleep.
fixed compile warning
queryview bugfix, color
added missing legend and color
"ressources" => "resources"
add state "loading collections" to query profile results
colors, gv
query view, images
performance optimization
As we wait for arangodb to be up and running, we should also wait for its shutdown on deinstall.
f*in with nsis
fix one more typo
Fix syntax error
Work around more cmake / cpack / nsis vodoo
...
Conflicts:
arangod/Cluster/ClusterComm.cpp
arangod/RestHandler/RestReplicationHandler.h
commit 56aef8f6a8d6106dd717ecde1cd37a6a87cc7fa4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Wed Oct 12 14:28:33 2016 +0000
add missing function to RestDemoHandler.h
commit 819995d0a65fe5450f655e572086e4b4999b9e48
Merge: 0561bc8 300066f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Wed Oct 12 16:07:26 2016 +0200
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'devel' of github.com:arangodb/arangodb: (34 commits)
More logging in case of strange timeouts.
Different agents log in different files.
Fix windows config paths for the PKGDATADIR
Fix windows compile
Remove debugging
Another place we need the binaryPath for windows
cppcheck
Fix windows compile
fix compile warning
Added a new isEnterprise function in js internal module. Started to make gharial aware of SmartGraphs
More places to pass along the binaryPath for teh windows
fixed issue '"WARNING DefaultCustomTypeHandler called" on read'
its nullptr on windows too.
Protect memory accesses to _snapshot in Supervision.
We also need to know the binary directory when looking up the config file; else we may miscalculate file locations.
disable optimizations for package builds to least common denominator.
- Fix enterprise package naming for windows & mac - add missing `make package` target for mac
Fix a bug in RemoveBlock.
Add support for AQL REMOVE for smart edge collections.
Fix paths
...
commit 0561bc82374cb8ee61d8b5587ef10895a1bfe580
Merge: 302b5f2 682ec09
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Wed Oct 12 09:17:14 2016 +0200
Merge branch 'boost_asio_mops_schleife' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'boost_asio_mops_schleife' of github.com:arangodb/arangodb:
dont re-send request in case of connection timeout
fix segfault when connection is gone
commit 302b5f2a1311b0537246d3ca767edf213e27cff2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Wed Oct 12 09:15:55 2016 +0200
add - extra log message for timeout)
commit 682ec09985f4c10f95022be3c11b5f5587793f57
Merge: 0251d33 2760ea0
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 11 10:55:49 2016 +0200
Merge branch 'boost_asio_mops_schleife' of https://github.com/arangodb/arangodb into boost_asio_mops_schleife
commit 0251d33da34b43758d71be98f675404c531b4def
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 11 10:55:36 2016 +0200
dont re-send request in case of connection timeout
commit ca6565d9e20eaffb7786c6e13283640ed070b749
Author: jsteemann <jan@arangodb.com>
Date: Tue Oct 11 10:55:21 2016 +0200
fix segfault when connection is gone
commit 2760ea03923e4a870c2b48fbfd40d6107faeb069
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Oct 11 09:37:42 2016 +0200
cancel keep alive timeout when calling handler
commit 0f0add4cf2da57464f3b7dbcbfc8db864b735bfb
Merge: 250dd05 0bfe447
Author: Frank Celler <frank@arangodb.com>
Date: Mon Oct 10 17:17:24 2016 +0200
Merge remote-tracking branch 'origin' into boost_asio_mops_schleife
commit 250dd051114c120bcbc1dcaf2a7d10da609d9cf2
Merge: 5dd1e85 5a59619
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Oct 10 11:47:05 2016 +0000
Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'curl-communicator' of github.com:arangodb/arangodb:
commit 5dd1e85b699616fc5585c53d4cdaca6cdef76401
Merge: 58cf544 04c49f6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Oct 10 13:46:18 2016 +0200
Merge branch 'boost_asio_mops_schleife' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'boost_asio_mops_schleife' of github.com:arangodb/arangodb:
fix curls CMake
commit 5a59619599fc5c7d442af65906a00770602d953d
Merge: 1103c97 60f7d9d
Author: Andreas Streichardt <andreas@arangodb.com>
Date: Mon Oct 10 13:42:52 2016 +0200
Merge remote-tracking branch 'origin/devel' into curl-communicator
commit 58cf544f99c51232a8dc5ed2664be4001068eceb
Merge: 6563b98 60f7d9d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Oct 10 13:40:38 2016 +0200
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'devel' of github.com:arangodb/arangodb: (35 commits)
Fix dump/restore tests.
Add a sensible default.
MSC_VER is an integer
fix compilation on windows broken by 4e8fc9b665
overview documentation of agency
overview documentation of agency
fixed license path
Added agency HTTP API
switch to bold
Update Version.cpp
extend the compiler type with compiler-version
creating snap package (with -DUSE_SNAPCRAFT=ON)
Create snap.cmake
Create snapcraft.yaml.in
Link jemalloc staticaly.
overview documentation of agency
Revert "Fix return value of local edge write to smart edge collection in AQL."
Fix return value of local edge write to smart edge collection in AQL.
Fix writing of edges in AQL to smart edge collections.
Changes necessary for AQL INSERT for smart edge collections.
...
commit 6563b98850722c1ed45db7737576ca7e73b9a437
Merge: f0b59f1 1103c97
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Oct 10 13:05:24 2016 +0200
Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'curl-communicator' of github.com:arangodb/arangodb:
Add proper cleanup
clang format
Do threaded resolving in curl...because otherwise we will have timeouts (klingt komisch, is aber so)
error buffer
bool fail
Add errordetails
Boolfail :S
Conflicts:
arangod/Agency/Agent.cpp
arangod/Cluster/ClusterInfo.cpp
lib/SimpleHttpClient/Communicator.cpp
lib/SimpleHttpClient/Communicator.h
commit 1103c97b8ad3a398ee1df53cd2226ee45d4a4c73
Author: Andreas Streichardt <andreas@arangodb.com>
Date: Mon Oct 10 12:53:01 2016 +0200
Add proper cleanup
commit 9fdc5858bc32e2d7a34271e8ee08c4e931127451
Author: Andreas Streichardt <andreas@arangodb.com>
Date: Mon Oct 10 12:51:52 2016 +0200
clang format
commit 19769f13bb6faad02a23a5750f9fb295d47fb847
Author: Andreas Streichardt <andreas@arangodb.com>
Date: Mon Oct 10 12:00:45 2016 +0200
Do threaded resolving in curl...because otherwise we will have timeouts
(klingt komisch, is aber so)
commit 04c49f64240fcbec1b44143f295c8c4fdcb03b54
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Oct 10 09:21:05 2016 +0000
fix curls CMake
commit 715f41f172406dacafa809e5ca1c075c10fab7cf
Author: Andreas Streichardt <andreas@arangodb.com>
Date: Mon Oct 10 10:52:38 2016 +0200
error buffer
commit 0fd78ec9d1789000959b0770afc384bd5f740c13
Author: Andreas Streichardt <andreas@arangodb.com>
Date: Mon Oct 10 10:41:55 2016 +0200
bool fail
commit 7d71bd590c101f9d1161eacfed24053bada5c3bc
Author: Andreas Streichardt <andreas@arangodb.com>
Date: Mon Oct 10 10:32:54 2016 +0200
Add errordetails
commit 25bab33fb50edbd2a159e601e9e4ceddf3ff3fee
Author: Andreas Streichardt <andreas@arangodb.com>
Date: Fri Oct 7 18:30:25 2016 +0200
Boolfail :S
commit f0b59f1ff2e374e54e50af14c2ab129d6b053a19
Author: Frank Celler <frank@arangodb.com>
Date: Fri Oct 7 11:43:32 2016 +0000
release strand at the end
commit b3512b4d5a0284e5907a51656666b5e0482d3298
Merge: 7bbe0c6 d08fe7f
Author: Andreas Streichardt <andreas@arangodb.com>
Date: Fri Oct 7 16:08:17 2016 +0200
Merge branch 'devel' into curl-communicator
commit f1ee42104c4a3b46e69c1a66c5c3290f1c0b13b7
Merge: 7a79485 7bbe0c6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Fri Oct 7 13:57:05 2016 +0000
Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'curl-communicator' of github.com:arangodb/arangodb:
fixed windows compile errors
commit 7a794855d7174414514a7003d53e68f0e9e0dc6e
Merge: 2917f1b d08fe7f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Fri Oct 7 13:56:43 2016 +0000
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'devel' of github.com:arangodb/arangodb:
add option to disable processor specific optimisations
fix AQL tests in cluster
don't write undefined into the errors file if no GDB output is there
Modified the internal constructor of general graph to use a single json object instead of several input parameters.
Improve collection handling in AQL (still far from good).
Modernized general-graph module. It now uses ES6 class syntax.
Testing.js now starts in enterprise mode if possible.
commit 2917f1b49f8d8b50046ac5c00ce51fe158d7e121
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Fri Oct 7 12:51:22 2016 +0000
fix asio shutdown
commit b472335448ba0ac1c00e270d498506c49272add1
Merge: a6e4d12 ecc3b56
Author: Frank Celler <frank@arangodb.com>
Date: Fri Oct 7 14:10:30 2016 +0200
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife
commit a6e4d128d05ee03df7510509467cba3f81dda89e
Author: Frank Celler <frank@arangodb.com>
Date: Fri Oct 7 10:42:27 2016 +0000
added clearHandlers
commit 7bbe0c68b64fcc81ec17474f67bc4cafe4c61e50
Author: Mark <mark@arangodb.com>
Date: Fri Oct 7 10:47:43 2016 +0200
fixed windows compile errors
commit 4f41c5dffa2191ddcd677aa774c36de3d7d9dde3
Author: Wilfried Goesgens <willi@arangodb.com>
Date: Thu Oct 6 18:19:16 2016 +0200
output exit signal
commit 8152513d152c5d7912d9f62e423bb1a0075bad64
Author: Frank Celler <frank@arangodb.com>
Date: Thu Oct 6 15:22:32 2016 +0000
added clearHandlers
commit 5ce884b3c3abcae562dd26df97a99b30d9745b7c
Author: Frank Celler <frank@arangodb.com>
Date: Thu Oct 6 14:26:24 2016 +0000
added reset for asio handler
commit 4be942d98c8ff6a051344ad01685682e985d2210
Author: Frank Celler <frank@arangodb.com>
Date: Thu Oct 6 15:55:53 2016 +0200
added reset
commit 2d18a0175cef55b9f41097a5a31b1ec85574f2fe
Author: Frank Celler <frank@arangodb.com>
Date: Thu Oct 6 15:55:19 2016 +0200
removed warning
commit 0d6e033dd83938fff6c3013c9e965cfb58d53722
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Oct 6 10:11:34 2016 +0200
fix typo
commit 02a7726fbcd012a22c62a8bee09f4dfa96583bc3
Merge: f9a2ae5 794b0e0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Oct 6 09:57:17 2016 +0200
Merge branch 'boost_asio_mops_schleife' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'boost_asio_mops_schleife' of github.com:arangodb/arangodb:
need to call cancel before erase
commit f9a2ae5fa17517089b5ca4f2d37d92a73243dbbf
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Oct 6 09:54:55 2016 +0200
try to fix shutdown by consuming all work by calling run_one in a loop
commit 94b679a3a0f2daa1fe4588809356672e2035fed2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Wed Oct 5 07:50:39 2016 +0200
fix leak
commit 794b0e00d5b66d8d57486b007f666b5ee5027648
Author: Frank Celler <frank@arangodb.com>
Date: Tue Oct 4 16:06:26 2016 +0200
need to call cancel before erase
commit c7a3107d69aed7052b3cea42b4b8deed37ac19e2
Merge: c5b3840 21298c3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Oct 4 15:49:53 2016 +0200
Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'curl-communicator' of github.com:arangodb/arangodb:
Revert "making it build partly out of source"
commit c5b3840b23a7e0ed77b53f333cba964c8cdc7a5d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Oct 4 15:24:19 2016 +0200
add call to curl multi cleanup
commit e57aad9cfab3466bba69f1fce9dd567a57b5cdbd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Oct 4 15:14:51 2016 +0200
fix call curl global cleanup
commit f80f50a809dfef03079393c4472fce863e0524a0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Oct 4 14:10:48 2016 +0200
add suppressins file for asan
commit 21298c36026d0d63282a2c17b37b082f4bab7101
Author: U-WIN-O80T0OH79D8\jenkins <jan@uhdejc.com>
Date: Tue Oct 4 12:33:10 2016 +0200
Revert "making it build partly out of source"
This reverts commit 82eea7a19e722ae5d89efb38140aaadcbd53d398.
commit f3b21b211df92a0d96d1476b74333d41a9060c7d
Merge: 3a5993d 595fc9b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Oct 4 12:09:17 2016 +0200
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'devel' of github.com:arangodb/arangodb: (27 commits)
moveShard with distributeShardsLike
moveShard with distributeShardsLike
moveShard with distributeShardsLike
linux fixes
more authentication events, fixed changePassword
arangodb::aql::Collection::shardIds for smart edge colls.
Fix a typo.
Edge indexes have now ID 1.
grunt build
fixed typo
gv fixes
grunt build
ui - move aql result into graph viewer
added different path for different editions
Do not wait for synchronous replication to settle when creating a database.
distributeShardsLike now stores CID
Fix error handling for ClusterInfo::getCollection.
distributeShardsLike now stores CID
Fix enterprise version for non-smart and single server graph traversals.
shards view [ci skip]
...
Conflicts:
arangod/RestHandler/RestAuthHandler.h
arangod/RestServer/arangod.cpp
commit 3a5993d9e94cdfc635b038df923984d1802e7383
Merge: df57ad9 3ac64be
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Oct 4 11:44:46 2016 +0200
Merge remote-tracking branch 'origin/curl-communicator' into boost_asio_mops_schleife
* origin/curl-communicator:
Add CURL_STATICLIB globally
Finally set variables correctly
Disable tests
Remove debug
Do not use MS scale timeout
Add curl build dir
Fix include path for curl..no idea why there is no CURL_INCLUDE_DIRS style variable...
curl static against openssl
Add curl
making it build partly out of source
Curl on windows
Make the crc message status (so it doesn't pop up as red in the cmake ui)
commit df57ad959b79da789ead2058fe8440e97cd09d74
Merge: b3653e9 b4e5123
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Oct 4 11:22:45 2016 +0200
Merge branch 'boost_asio' into boost_asio_mops_schleife
* boost_asio:
replace our ssl init calls with boost::asio::ssl calls
fix ssl in cluster
commit b4e5123798e62954c683af073b4db3191a395a61
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Oct 4 11:07:40 2016 +0200
replace our ssl init calls with boost::asio::ssl calls
commit 3ac64be8a4b0e95162401b87b3cac903897be082
Author: Andreas Streichardt <andreas@arangodb.com>
Date: Tue Oct 4 10:22:06 2016 +0200
Add CURL_STATICLIB globally
commit e93940cb0c1905d8157070adc8cce13c0b11bd5c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Oct 4 09:51:44 2016 +0200
fix ssl in cluster
commit 833722cdd151edac81b4834a0b838961b87aca99
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date: Thu Sep 29 18:44:24 2016 +0200
Finally set variables correctly
commit 663822cc23cee0001eb7faf5419719eac77849da
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date: Thu Sep 29 18:02:17 2016 +0200
Disable tests
commit c0d7a9a73fcf9f42de7c13b87af02d7db326d586
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date: Thu Sep 29 17:12:55 2016 +0200
Remove debug
commit 28367243f8c3b79fcf99f16017e9360b2e2f9ac9
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date: Thu Sep 29 17:12:09 2016 +0200
Do not use MS scale timeout
commit ceaa2682baf3bb0a028cdb5211a0c334d5db23b3
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date: Thu Sep 29 16:39:04 2016 +0200
Add curl build dir
commit b3653e93a890745b32db11f45506b723d67fc99d
Merge: e000dab 11a9d3b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 29 16:25:47 2016 +0200
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_mops_schleife
* 'devel' of github.com:arangodb/arangodb: (23 commits)
local cluster start update
aql editor now handles queries running in the background
slightly higher timeout for notifications
oops useless assignement
arangod/Cluster/ClusterInfo.cpp
gv save settings bugfix
Add #2038 to changelog
Handle multiple request body models
agency bug resolved
color optimization query profiling
Fixed Smart graph injection of collections.
fix compile warning
grunt build
semistandard
ui - cacheable explain
improved query ui
fixed long waits on dropping shardless collections
lintify
Faster creation of smart edge collections.
Make AQL aware of smart traversals for enterprise.
...
Conflicts:
arangod/Agency/Agent.cpp
commit 624eec008c842ff0f48a1b259de54097618353c3
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date: Thu Sep 29 16:12:38 2016 +0200
Fix include path for curl..no idea why there is no CURL_INCLUDE_DIRS
style variable...
commit e8a6173b74490fda4c57ab18708c929ed4f5a22c
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date: Thu Sep 29 16:03:28 2016 +0200
curl static against openssl
commit 522177b71132c6277fd4c08630bbfae3a509fdf8
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date: Thu Sep 29 15:20:42 2016 +0200
Add curl
commit 82eea7a19e722ae5d89efb38140aaadcbd53d398
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date: Thu Sep 29 15:19:14 2016 +0200
making it build partly out of source
commit e000dab111721d8cb9548b26d9e2dc9015a4fbf4
Merge: e08ada2 b3ae63b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 29 10:59:19 2016 +0200
Merge remote-tracking branch 'origin/curl-communicator' into boost_asio_mops_schleife
* origin/curl-communicator:
Remove request unittest
Implement cURL based inter server communication
Conflicts:
arangod/Cluster/ClusterComm.cpp
commit 25b01518a5fb2ba2d047b082ac6596b44e13008c
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date: Thu Sep 29 10:58:30 2016 +0200
Curl on windows
commit e08ada250ca283d59328c7577f1d3e9affa55aeb
Merge: 8c4ad1d 16d1d21
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 29 10:19:35 2016 +0200
Merge remote-tracking branch 'origin/devel' into boost_asio_mops_schleife
* origin/devel:
ui slow connection bugfix, cleanup
Updated the general-graph module to ignore SmartGraphs which are enterprise only.
Fix output of _id attribute for new documents in smart edge collections.
Fix virtual cloning of LogicalCollections and derived types.
Describe current format of document _key
Docs: adds links to AQL traversal for anonymous graphs
small ui shard fix
Silence a compiler warning in enterprise mode.
Remove isSmart attribute in community edition for Agency.
Improve an if statement.
grunt build
modified cluster nodes ui
ui logos
added functionality to see the movement status of a shard
Adding Smart Edge Collection drops to v8-vocbase
Add SmartVertexCollection.
commit 8c4ad1d63a68c7cfb99cf61cc22148b774b5b0dc
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 29 10:06:19 2016 +0200
add comment about potential issue
commit 31317b300da44e3f7e19d8fd5a781d3ef5440702
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date: Thu Sep 29 09:46:26 2016 +0200
Make the crc message status (so it doesn't pop up as red in the cmake ui)
commit b3ae63bd7974f762fb2499416402186199811818
Author: Andreas Streichardt <andreas@arangodb.com>
Date: Wed Sep 28 15:59:27 2016 +0200
Remove request unittest
commit f5bc6efc263d9159c6c2134309c7a8e11d50789d
Author: Andreas Streichardt <andreas@arangodb.com>
Date: Wed Sep 28 15:58:55 2016 +0200
Implement cURL based inter server communication
commit c5760194cde05ca73426ef4672ba97fe41ac0083
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Wed Sep 28 15:30:32 2016 +0200
fix ssl server test (bad weak ptr)
commit 136100991320261b15c0277941992086bfa07c57
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Wed Sep 28 15:04:50 2016 +0200
better output
commit 495a3b65fc360c4dd8a1277f129d81bbba57493c
Merge: 635bc9f 8a5bc21
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Wed Sep 28 14:27:44 2016 +0200
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_statistics
* 'devel' of github.com:arangodb/arangodb: (63 commits)
elderly cmake compatibility
spec files rather like 0/1 than fales/true
Forward isSmart to Agency.
Restrict _from_ replacement (etc) to the beginning of the string.
enterprise id lookup
calculate systemd unit directory in cmake instead of leaning on specfile finding it in some rpm magic
cluster ui fix
Fix hanging dbservers in graph tests.
We don't need go anymore.
fix sortedness documentation (additional clarification)
Fix branch choice.
fix creation of run directories - these shouldn't be in the client package
updated CHANGELOG
issue #2079
Added some smart info into logical collection and make sure that virtual collections are created via load plan
make relative temporary paths absolute during the system startup. This fixes#1896
follow redirect for dumpagency
New depth first search simulators.
fixed test, typo, optimization
version info
...
Conflicts:
CHANGELOG
Installation/Jenkins/build.sh
arangod/Agency/RestAgencyHandler.cpp
arangod/RestHandler/RestReplicationHandler.cpp
commit 635bc9fae42b7b16fffabebe3303f92e240bbf5f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Wed Sep 28 14:19:25 2016 +0200
fix request statistics
commit 9462a446f73f6e82ff870131938f73d3eae3bd25
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Wed Sep 28 14:15:01 2016 +0200
silence boost warnings
commit 836289100b64a5f3ef8173446f08eaba60752770
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Wed Sep 28 10:16:34 2016 +0200
better log messages
commit 2dbb8d2438f895c380612f0a2bf097928b43191d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Sep 27 14:51:39 2016 +0200
clean up of KeepAliveTimeout
commit 6c97d8f21dfd4b5e41fa507465875833ca75554d
Author: Frank Celler <frank@arangodb.com>
Date: Tue Sep 27 12:25:16 2016 +0000
removed TaskData & chunks
commit 71bd6d83eb7cac58de1a4473af4d4e9e262ab50f
Author: Frank Celler <frank@arangodb.com>
Date: Tue Sep 27 11:54:32 2016 +0000
fixed name
commit 821eb554305073325a4b68864cba065705f0fac3
Author: Frank Celler <frank@arangodb.com>
Date: Tue Sep 27 11:54:20 2016 +0000
added missing state transition
commit 119171859612b864a290cde321ba1f80ba51eb62
Author: Frank Celler <frank@arangodb.com>
Date: Tue Sep 27 13:43:17 2016 +0200
added WAIT_FOR
commit 41e6d3108d64467583a79d3d9dd2096f0dded26b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Sep 27 12:45:12 2016 +0200
print more info about connection in communication.debug mode
commit 22c83f8b695d745e4531896b4b5815bba1b10eba
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Sep 27 11:14:17 2016 +0200
fix handling of timeout. add new event after resetting
commit 66c8247e1ce3fb4a69c5375c0f61b2b57f20c217
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Sep 27 09:43:33 2016 +0200
keep alive timeout is now able to take values less than a second
commit 19b6cf554de78d8fec16cd370243ccc59aa345bc
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 26 16:48:02 2016 +0200
add keepalive timeout
commit f03757998cae93b3ddc31eded83ea69cebc09039
Author: Mark <mark@arangodb.com>
Date: Mon Sep 26 14:30:24 2016 +0200
fixed windows compile errors
commit f4dec34e77f02995bdaba0a73c88aadccad37524
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 26 11:24:15 2016 +0200
add option for maximal VPackChunkSize to the server
commit a2fccca23411368fa819785223949fefcdc962c8
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 26 09:47:38 2016 +0200
initialize connection info - server/client address/port
commit 5df04763c03e227965065946b8f170654e36c59e
Author: Frank Celler <frank@arangodb.com>
Date: Sun Sep 25 11:02:18 2016 +0000
cppcheck fixes
commit 2a47e4e99bad63c92f1834c738cf30f0e465a1b4
Merge: 278ba49 1bdf414
Author: Frank Celler <frank@arangodb.com>
Date: Sun Sep 25 10:47:12 2016 +0000
Merge branch 'devel' of https://github.com/arangodb/arangodb into boost_asio
commit 278ba49a87762365ea37fc3fb5040259a1e3df75
Author: Frank Celler <frank@arangodb.com>
Date: Sun Sep 25 10:46:45 2016 +0000
free vocbase on cancel
commit e3b36c8418a816076449be3dea29f865b4952229
Author: Frank Celler <frank@arangodb.com>
Date: Sun Sep 25 10:28:22 2016 +0000
check if handle have been installed
commit 92aac95b39c9fc7b3d712b4770e3b3c420626ef9
Author: Frank Celler <frank@arangodb.com>
Date: Sat Sep 24 16:21:50 2016 +0000
fixed batching
commit 92d1335cf2a6bd296c23aa8165718fd4d283af6d
Author: Frank Celler <frank@arangodb.com>
Date: Sat Sep 24 14:04:47 2016 +0000
fixed leak of ListenTask
commit 5d4fb6fd1250e0a30fbe2326d11087ba3ae13b1c
Author: Frank Celler <frank@arangodb.com>
Date: Sat Sep 24 11:34:47 2016 +0000
fixed shutdown
commit c6fb584266818eef765aa8b6727858ab2100859a
Author: Frank Celler <frank@arangodb.com>
Date: Sat Sep 24 11:15:05 2016 +0000
handle shutdown
commit 7dcc50214e3e51ef58d3823ec70534354e1a98eb
Author: Frank Celler <frank@arangodb.com>
Date: Sat Sep 24 11:14:54 2016 +0000
handle aborts
commit 35dd9da84a69dda4103cc82be47d740550d49069
Author: Frank Celler <frank@arangodb.com>
Date: Sat Sep 24 10:57:57 2016 +0000
cppcheck fixes
commit 2f9f7d87005e48904711a9b4a2863ddb98834f79
Author: Frank Celler <frank@arangodb.com>
Date: Fri Sep 23 20:57:41 2016 +0000
added cancel
commit b4696026ec9cee01f196a7096a86d29cdf8ce202
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Fri Sep 23 21:30:10 2016 +0200
convert _scheduler in SchedulerFeature to unique_ptr
commit 0475c6dd7bdd3c842860e85ad26a607df675d600
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Fri Sep 23 17:34:07 2016 +0200
implement synRun
commit a2b365613b5779dd59004b8cfcca04ef145c3ad3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Fri Sep 23 16:35:34 2016 +0200
fix error caused by RestHandler not beeing created as shared_ptr
commit 8f19bbb03efa2d2bc6106b8b456040ce7cbb0c68
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Fri Sep 23 16:32:38 2016 +0200
fix some cppcheck errors
commit 7694392f73f920df4c033d98025112189d19aa00
Merge: eea0fd7 35e14fd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Fri Sep 23 14:54:59 2016 +0200
Merge remote-tracking branch 'origin/devel' into boost_asio
* origin/devel: (43 commits)
cleanup
speed up tests
add setUpAll, tearDownAll
modified collection info view
rechecking dbservers before sharding operations
updated CHANGELOG
issue #2072
adjusted progress indicator delay
nodes view
fixed wrong navi route
updated CHANGELOG for #2071
updated CHANGELOG
issue #2071
fixed compile error
updated CHANGELOG
issue #2070
Some refactoring in Transaction. Also enterprisified document
FailedServer jobs can report when last FailedLeader has been processed
Fixed optimization of ANY in Traversals. It was included in the traverser who actually cannot handle it.
FailedServer jobs can report when last FailedLeader has been processed
...
Conflicts:
CHANGELOG
commit eea0fd7c42fc55cd4a1233f458c990186ad6cfc2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Fri Sep 23 14:31:00 2016 +0200
improve error handling and reporting in SocketTask
commit 505d55d1a1feff6c93388c5c401273d4199438a7
Author: Frank Celler <frank@arangodb.com>
Date: Fri Sep 23 11:56:48 2016 +0000
removed duplicate store
commit 14669814e0eaab9a4c78c8f4396dc88181f6a4fa
Author: Frank Celler <frank@arangodb.com>
Date: Fri Sep 23 11:34:31 2016 +0200
missing self for callback
commit 8ad4ee25ef7aaa4cc9cf01d6fe3f56d805e3e9c2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Fri Sep 23 11:10:31 2016 +0200
do error handling with error codes instead of exceptions for asio
commit c1d7375c1b0ab0fd3f7f3c682baa2946c05fc4ec
Merge: 9be5942 0e073aa
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 22 23:03:07 2016 +0200
Merge remote-tracking branch 'origin/FMH' into boost_asio_merge_frank
tests broken!
* origin/FMH:
added move
WIP
WIP
added shared_from_this
added shared_from_this
WIP
WIP
Conflicts:
arangod/GeneralServer/GeneralCommTask.cpp
arangod/GeneralServer/RestHandler.cpp
arangod/GeneralServer/RestStatus.cpp
arangod/GeneralServer/RestStatus.h
arangod/RestHandler/RestBatchHandler.cpp
arangod/Scheduler/Scheduler.h
commit 0e073aaee9508129da6b1c83661e08050e172bff
Author: Frank Celler <frank@arangodb.com>
Date: Thu Sep 22 16:00:28 2016 +0000
added move
commit 9be5942d18c5dfd66c41c5520b7cdf54025e7ed0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 22 16:10:31 2016 +0200
change default chunk size
commit e17d2e4828b1abc4837db0fe7c5ef88d31ddf063
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 22 15:58:23 2016 +0200
multichunk sending is now working
commit 3144b72f7883b5b0f3d1df8f4acf0ec996a70e4f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 22 15:40:43 2016 +0200
try send multiple chunks
commit f7f1ff11fb47eac7e289b78b9bf4dd0adea0285a
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 22 14:55:41 2016 +0200
git commit prepare sending of smaller chunks
commit 50088a7006bc7ac94e4706a50382831214a5c0a6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 22 14:54:03 2016 +0200
change cmake for boost
commit 29b00dcd8354144fad5048add5621d657b5f54b1
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 22 13:12:50 2016 +0200
fix linking issues on windows caused by auto-linking feature of boost
commit 05da308660cbf67d84a62cdbd11c71e02d8cad7b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 22 13:12:13 2016 +0200
remove forward declaration that prevents build on windows
commit 521ce1aebf055fedd9ad42bd63d91d65e4f34f42
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 22 11:53:11 2016 +0200
disable autolinking code for linux
commit b67dc616340319591370957149827d2a0e4ad995
Merge: 2ac2440 467a949
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 22 11:25:56 2016 +0200
Merge branch 'boost_asio' of github.com:arangodb/arangodb into boost_asio
* 'boost_asio' of github.com:arangodb/arangodb:
work on sending in small chunks
commit 2ac244015b6556d52b99906612ff3feaad3d60ab
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 22 11:25:15 2016 +0200
update boost in cmake
commit 467a949263a21d1b0af886d01fa471f568c21343
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 22 10:59:37 2016 +0200
work on sending in small chunks
commit 4d0816808b701af217db9c4faccd3ef780efb79c
Author: Frank Celler <frank@arangodb.com>
Date: Wed Sep 21 15:42:06 2016 +0200
WIP
commit 8c7d3dbca6a34080df1d807e0ec35b57b0acc172
Author: Frank Celler <frank@arangodb.com>
Date: Wed Sep 21 15:39:54 2016 +0200
WIP
commit 6d5b19939ae2fbeb157d3773d415b6cf980f3fd5
Author: Frank Celler <frank@arangodb.com>
Date: Mon Sep 19 17:25:15 2016 +0200
added shared_from_this
commit b297b3a702de303212edfc3545602b5b4fb987f9
Author: Frank Celler <frank@arangodb.com>
Date: Mon Sep 19 17:25:06 2016 +0200
added shared_from_this
commit 5fb39bf9e9ce03c291dadfd48f84f94a12f488d3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 16:47:18 2016 +0200
fix windows errors
commit b3f71399e12cc5e59e1bbdb4ca87b7d588fb7da9
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 16:36:55 2016 +0200
add TaskData.h to GeneralServer.cpp and GeneralListenTask.cpp
commit da99cb2e3151f454ef346ded57c2d4865125ab7b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 16:11:49 2016 +0200
replace magic number with boost::asio::error::would_block
commit a10aa87742153aab5a5aca53815ff44a2abc98f0
Author: Frank Celler <frank@arangodb.com>
Date: Mon Sep 19 16:11:24 2016 +0200
WIP
commit 368d62245efad52178acf279ff4f54eb8b03e8e5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 15:35:18 2016 +0200
add boost to arangod_v8
commit 2ef495a1d1aed97b6eb1c106107a90a27e1891ba
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 15:25:09 2016 +0200
remove .gitignore
commit 6005aed8b24a40e4fcc6f0569407cd10c8a973c0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 15:18:21 2016 +0200
fix more windows errors
commit e322da8eb08254c661781cea442cd6e403069ecd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 15:00:48 2016 +0200
force boost system to be static
commit 6082736132272f600de5f9d76805dde373bc742b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 14:43:53 2016 +0200
another fix for windows
commit a36f6930fca35662e21b762bb323c2dc36a05e5a
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 14:39:02 2016 +0200
fix add namespace to Socket
commit 38eeda76ad0a145176c5b05ae75d4640a3514cc4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 14:30:38 2016 +0200
fix namespace / include
commit 26513ae75a22911d5b4e8584f5e8ae9314469999
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 14:19:18 2016 +0200
try to get boost working on windows
commit 00b6416a6452fef0d8e43424ea4e1735c3b0e614
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 14:06:05 2016 +0200
replace #warning with #pragma message - windows
commit bf455d30047ebd37a037fc24522bc502854cbbe8
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 14:03:38 2016 +0200
improve cmake for boost
commit 6c491e5e784c0c33cf282b5d64026b61d60711a6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 13:39:46 2016 +0200
apply fix for windows
commit a9f9f429d8eba25b8f7215399e41dd5524bfd76b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 13:33:33 2016 +0200
replace FAILED with FAIL so windows has no problem
commit 3cbac4115ef183ae38676584abef41b914d2592e
Merge: c614242 19f667c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 13:09:14 2016 +0200
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_devil
* 'devel' of github.com:arangodb/arangodb:
fixed incompatible replication API responses
updated CHANGELOG
added experimental AQL functions `JSON_STRINGIFY` and `JSON_PARSE`
added experimental support for incoming gzip-compressed requests
fixed issue #2060
Added a hash and equals comparator for velocypack that only takes _id into account.
vs warnings in agency
Made the Base Traverser Engine pure virtual
Conflicts:
CHANGELOG
arangod/GeneralServer/HttpCommTask.cpp
arangod/RestHandler/RestReplicationHandler.cpp
commit c614242c4beb2ed12ccb29fcc6fa1db6a4d9090f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 10:49:19 2016 +0200
try to fix RestReplicationHandler
commit 74b5fc33477107be62a5d86c9c04563cc4d7cac5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 09:12:14 2016 +0200
remove CMakeFiles form .gitignore so git clean will work again
commit c330b1bff7acb6022b06e2499fa3a065fb820b82
Merge: d400b7f 5772054
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 09:10:39 2016 +0200
Merge branch 'boost_asio' into boost_asio_devil
* boost_asio:
renamed Task2 to Task, EventLoop2 to EventLoop
WIP
remove https und vpps commtasks
WIP
commit d400b7fde3c6a7b6d1c2e2cad600a3fb32b65533
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 08:49:38 2016 +0200
Revert "remove useless file"
This file sets indent to 2 spaces for almost all editors,
this way we do not need modelines or change the default
editor configuration on systems.
This reverts commit e0503f7092.
commit 40dcd9ec34e3c741ffdb97d4101e53c49d0ac163
Merge: d5526cf ebb67be
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 19 08:40:00 2016 +0200
Merge remote-tracking branch 'origin' into boost_asio_devil
* origin:
Remove outdated information about suppress-shape-information which was removed with ArangoDB 3.0, as reported by Tomek on Stackoverflow.
remove useless file
updated CHANGELOG
examples about stacked escaping
Fix generated MD5sum file
make methods private
speed up collection.any()
speed up skiplist index
fixed ssl_server test
examples about stacked escaping
more diagnostics
commit 8875f7bfc22cc4376b703060e85ac0141706aca5
Author: Frank Celler <frank@arangodb.com>
Date: Sun Sep 18 22:53:16 2016 +0200
WIP
commit 57720546a31a59668cd57e99d3dbc11ecfa41a8d
Author: Frank Celler <frank@arangodb.com>
Date: Fri Sep 16 11:09:39 2016 +0200
renamed Task2 to Task, EventLoop2 to EventLoop
commit eca7b17f6910fc7892f6a4dbe9c618d3e8f7bf05
Merge: ca473e8 8f2c13e
Author: Frank Celler <frank@arangodb.com>
Date: Fri Sep 16 10:53:11 2016 +0200
WIP
commit 8f2c13ec0e2f8a4be4b136bd263affc3054654ae
Author: Frank Celler <frank@arangodb.com>
Date: Fri Sep 16 09:10:56 2016 +0200
WIP
commit ca473e8a0eee4ed04994f70b3d52defc9127810c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 15 16:19:26 2016 +0200
remove https und vpps commtasks
commit d5526cf1b606daa26be628efa9fdca2fe2664d95
Merge: 5337a01 c912d96
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 15 16:01:39 2016 +0200
Merge branch 'devel' of github.com:arangodb/arangodb into boost_asio_devil
* 'devel' of github.com:arangodb/arangodb: (39 commits)
Fixed compile bug.
TraverserOptions now support proper subclassing.
Added a virtual base class for traverser engines.
all lambdas in ClusterInfo might have been left with dangling references.
all lambdas in ClusterInfo might have been left with dangling references.
fix compile error
Correct path to enterprise js code in testing.js.
Finding graphs by name now resolve externals one step earlier.
potentially fix leak
removed unused flag
get rid of two pointers in each transaction operation
redirect output of gdb, so we can append it to the jenkins error mails.
Foxx: post route example that accepts an array of objects
implement use-local-time for slow queries as sugested in #2051
fixed windows compiler warnings
lookupGraphByName now has a non-enterprise implementation.
Removed a graph optimization which increased the minDepth if a filter is defined on a higher depth. Under some circumstances this filter can be matched if the path is not long enough.
fixed issue #2052
reporting in inception
fix assertion
...
commit 5337a0116ca20726795c59666cdfd6786f93cc82
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 15 15:53:12 2016 +0200
ssl server is working again
commit fcedf60588681518b0f6d3eb05661ec0f9e201d7
Merge: 322a08a c912d96
Author: Frank Celler <frank@arangodb.com>
Date: Thu Sep 15 14:48:54 2016 +0200
Merge branch 'devel' of github.com:arangodb/arangodb into FMH
commit 322a08a86eb9de101d0e37be5e3f6bdbdcb19345
Author: Frank Celler <frank@arangodb.com>
Date: Thu Sep 15 14:47:19 2016 +0200
WIP
commit 6f64f39744e3d34c48e69b9a742497d109f2464d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 15 13:04:46 2016 +0200
get encryption type via ConnectionInfo in SocketTask
commit abda1c4e1b8e0f05a15a47458fc6c9aaee4abeb4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 15 09:52:58 2016 +0200
add ssl support via asio - we are in a broken state now
commit a6a3215f5244a96a48fc5fe4545313018c181b68
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Thu Sep 15 09:47:36 2016 +0200
Fix cmake so it works with boost asio
commit baccaa00dc041e01822bfef723d6d285ab2c7ff2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Sep 13 16:20:23 2016 +0200
add basic changes to enable ssl
commit f7971e2f727ade913ce00958e0ad77e2e4c01613
Merge: c1c7b4e fee42ee
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Tue Sep 13 09:52:44 2016 +0200
Merge remote-tracking branch 'origin/devel' into boost_asio
* origin/devel:
Fixed ASSERTION guarding undefined behaviour on Mac. In some cases the assertion did throw.
Remove debug output.
simplified expression
warning removed
speed up looking up of revision ids
Constructor of TraverserEngine is now protected. Preperation for SmartGraphEngine (EE Only).
Fixed undefined behaviour on Mac. An empty vector was popped.
semi-fix for long delays in multi-host-agency collection creation/drop
semi-fix for long delays in multi-host-agency collection creation/drop
Link the CONCAT_SEPARATOR function.
Set agencySize back to 1 (temporarily).
Added a smartSearch route for Traversal Engines. In Community edition this will throw ONLY_ENTERPRISE. It should never be called by our code however.
Make testing.js find enterprise tests in enterprise version.
Add global.ARANGODB_CLIENT_VERSION to arangosh.
Silence gitjslint.sh tool w.r.t. warnings.
reformat
Fix which attribute names are allowed for shardKeys.
Typo fixes in docs
x-compile portability.
Silence cpack rpm build.
commit c1c7b4e61e5cecf9794e83f8b3bf5a965d460a53
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date: Mon Sep 12 12:09:19 2016 +0200
add boost_system via pure cmake!
commit c5d227eebffe311b24bc1d67c209d53eee0b0754
Author: Frank Celler <frank@arangodb.com>
Date: Sun Sep 11 21:24:58 2016 +0200
WIP
* origin/engine-vs-velocystream: (91 commits)
removed useless include
removed JsonParser
removed JsonHelper
Fixed another failed nullptr handling in LogicalCollection cluster case.
Fixed undefined behaviour in rest error creation
Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode
agency startup changed to bootstrapping
Mention howto control core files on linux.
shutdown fixed
Removed create / drop system collection from Cluster test. This is forbidden now
The logical colleciton now knows it's journalSize
Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again.
pushing corrected unittest script and cluster startup scripts
adjusting startup scripts
missing source file added
we have a bootstrapping agency
votes are processed correctly again
Add module.context.createDocumentationRouter
Don't implicitely build the windows packages.
remove debug print
...
Conflicts:
arangod/Cluster/ClusterComm.cpp
arangod/GeneralServer/VppCommTask.h
arangod/RestHandler/RestBaseHandler.cpp
lib/Rest/VppRequest.h
Jan
Max Neunhöffer
Simon Grätzer
m0ppers
Michael Hackstein
Dan Larkin
jsteemann
Andreas Streichardt
Jan Christoph Uhde
Kaveh Vahedipour
Frank Celler