1
0
Fork 0
arangodb/lib/Basics
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
..
ArangoGlobalContext.cpp 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
ArangoGlobalContext.h Make the existance of the database directory non-mandatory again. 2016-08-25 10:07:37 +02:00
AssocMulti.h added unload() functionality for indexes (untested) 2016-08-26 14:00:03 +02:00
AssocUnique.h added unload() functionality for indexes (untested) 2016-08-26 14:00:03 +02:00
AttributeNameParser.cpp Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
AttributeNameParser.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
Barrier.cpp signal under the lock 2016-08-17 17:06:51 +02:00
Barrier.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
BloomFilter.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
Common.h removed obsolete defines 2016-08-16 17:51:33 +02:00
ConditionLocker.cpp switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
ConditionLocker.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
ConditionVariable.cpp
ConditionVariable.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
ConditionalDeleter.h potential performance optimizations 2016-06-23 14:47:44 +02:00
DataProtector.cpp
DataProtector.h changes for Visual Studio 2016-08-19 17:22:57 +02:00
DeadlockDetector.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
Exceptions.cpp global exception catch block 2016-04-26 23:23:06 +02:00
Exceptions.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
FileUtils.cpp 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
FileUtils.h 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
HybridLogicalClock.cpp visual studio 2016-08-02 11:46:44 +02:00
HybridLogicalClock.h fixed random number generator initialization 2016-08-02 12:25:46 +02:00
Mutex.cpp fix errors during shutdown 2016-08-19 12:27:01 +02:00
Mutex.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
MutexLocker.cpp switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
MutexLocker.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
Nonce.cpp fixed crash in nonce handling 2016-06-21 11:35:34 +02:00
Nonce.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
ReadLocker.h some fixes 2016-08-01 17:16:23 +02:00
ReadUnlocker.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
ReadWriteLock.cpp privatization 2016-08-04 17:06:51 +02:00
ReadWriteLock.h privatization 2016-08-04 17:06:51 +02:00
ReadWriteLockCPP11.cpp updated cleanupCFiles 2016-04-23 16:34:57 -07:00
ReadWriteLockCPP11.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
ScopeGuard.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
ShortestPathFinder.h Fixed a bug in SHORTEST_PATH using a distance attribute. In some cases the computed path was not correct. 2016-06-27 16:57:47 +02:00
SkipList.h added unload() functionality for indexes (untested) 2016-08-26 14:00:03 +02:00
SmallVector.h added SmallVector optimization 2016-05-31 11:10:11 +02:00
StaticStrings.cpp Merge branch 'HLC' into devel 2016-07-13 12:52:33 +02:00
StaticStrings.h Merge branch 'HLC' into devel 2016-07-13 12:52:33 +02:00
StringBuffer.cpp various AQL changes 2016-05-23 17:10:15 +02:00
StringBuffer.h added assertions to prevent buffer overruns 2016-08-26 12:04:28 +02:00
StringHeap.cpp renamed CharLengthPair to StringRef 2016-06-15 19:33:08 +02:00
StringHeap.h renamed CharLengthPair to StringRef 2016-06-15 19:33:08 +02:00
StringRef.h prevent VS warnings 2016-06-28 17:16:48 +02:00
StringUtils.cpp don't copy 2016-06-07 23:08:43 +02:00
StringUtils.h don't copy 2016-06-07 23:08:43 +02:00
Thread.cpp fix errors during shutdown 2016-08-19 12:27:01 +02:00
Thread.h fix errors during shutdown 2016-08-19 12:27:01 +02:00
ThreadPool.cpp potentially fix thread pool shutdown issues 2016-08-17 11:30:27 +02:00
ThreadPool.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
Timers.cpp micro optimizations 2016-04-23 16:23:15 +02:00
Timers.h added timers 2016-04-28 12:48:02 +02:00
Utf8Helper.cpp potential performance optimizations 2016-06-23 14:47:44 +02:00
Utf8Helper.h potential performance optimizations 2016-06-23 14:47:44 +02:00
VERSION.in removed old files 2016-02-19 12:26:26 +01:00
VPackStringBufferAdapter.h added fillBody 2016-05-13 15:14:44 +02:00
VelocyPackDumper.cpp fixed issue #2018 2016-08-24 17:33:49 +02:00
VelocyPackDumper.h escape Unicode characters in JSON dumps 2016-06-29 12:53:08 +02:00
VelocyPackHelper.cpp prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
VelocyPackHelper.h prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
WorkDescription.h WIP 2016-05-21 21:58:42 +02:00
WorkItem.h fixed ownership of handler 2016-08-18 23:06:36 +02:00
WorkMonitor.cpp merge with frank 2016-08-19 10:00:43 +02:00
WorkMonitor.h fix errors during shutdown 2016-08-19 12:27:01 +02:00
WorkMonitorDummy.cpp fixed ownership of handler 2016-08-18 23:06:36 +02:00
WorkerThread.h potentially fix thread pool shutdown issues 2016-08-17 11:30:27 +02:00
WriteLocker.h some fixes 2016-08-01 17:16:23 +02:00
WriteUnlocker.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
application-exit.cpp
application-exit.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
build-date.h.in moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
build-repository.h.in Implement detection whether we are in a git repo and use the toplevel source dir. 2016-08-18 17:53:47 +02:00
build.h.in moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
conversions.cpp WIP 2016-04-15 22:09:55 -07:00
conversions.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
crc1.S .S files must be in capital case to have preprocessor handle them 2016-05-12 15:20:14 +00:00
crc4.S .S files must be in capital case to have preprocessor handle them 2016-05-12 15:20:14 +00:00
csv.cpp
csv.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
debugging.cpp attempt to finish startup order 2016-04-27 22:54:29 +02:00
debugging.h attempt to finish startup order 2016-04-27 22:54:29 +02:00
directories.h.in Windows install: no backslash strings in cmake. 2016-08-25 17:35:29 +02:00
error.cpp updated cleanupCFiles 2016-04-23 16:34:57 -07:00
error.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
errors.dat ERROR_APPLICATION_* -> ERROR_SERVICE_* 2016-06-17 20:02:25 +02:00
fasthash.cpp
fasthash.h
files.cpp Merge branch 'devel' into obi-velocystream-try-merge-devel 2016-08-30 22:04:31 +02:00
files.h 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
fpconv.cpp
fpconv.h
gcd.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
hashes.cpp constexpr 2016-05-10 17:14:18 +02:00
hashes.h constexpr 2016-05-10 17:14:18 +02:00
json-utilities.cpp try to fix potential crashes 2016-06-14 16:41:00 +02:00
json-utilities.h removed unused code 2016-05-10 16:04:10 +02:00
json.cpp try to fix potential crashes 2016-06-14 16:41:00 +02:00
json.h removed JsonParser 2016-08-19 12:39:26 +02:00
levenshtein.cpp switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
levenshtein.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
local-configuration-win.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
locks-posix.cpp move CleanupThread into engine 2016-08-17 10:48:17 +02:00
locks-posix.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
locks-win32.cpp
locks-win32.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
locks.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
make_unique.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
memory-map-posix.cpp more diagnoses 2016-05-04 21:49:44 +02:00
memory-map-posix.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
memory-map-win32.cpp updated cleanupCFiles 2016-04-23 16:34:57 -07:00
memory-map-win32.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
memory-map.h moved TRI_MSync out of server.h 2016-07-18 17:58:28 +02:00
memory.cpp try to fix potential crashes 2016-06-14 16:41:00 +02:00
memory.h micro optimizations 2016-05-01 00:03:23 +02:00
messages.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
mimetypes.cpp simplifications 2016-03-04 02:25:18 +01:00
mimetypes.dat
mimetypes.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
operating-system.h Simplify 2016-08-08 10:16:34 +02:00
powers.h
prime-numbers.cpp cppcheck 2016-05-10 20:13:55 +02:00
prime-numbers.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
process-utils.cpp Try to fix a shutdown memory leak. 2016-05-27 00:10:07 +02:00
process-utils.h two unused typedefs less 2016-06-15 22:40:31 +02:00
shell-colors.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
short_alloc.h added SmallVector optimization 2016-05-31 11:10:11 +02:00
socket-utils.cpp splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
socket-utils.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
structures.cpp
structures.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
system-compiler.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
system-functions.cpp added thread affinity for MacOSX 2016-07-27 22:29:59 +02:00
system-functions.h Merge branch 'obi-velocystream-4' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-07-28 16:11:26 +02:00
terminal-utils-posix.cpp
terminal-utils-win32.cpp
terminal-utils.cpp fixed ifdef 2016-07-07 11:41:45 +02:00
terminal-utils.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
threads-posix.cpp added thread affinity for MacOSX 2016-07-27 22:29:59 +02:00
threads-posix.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
threads-win32.cpp switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
threads-win32.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
threads.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
tri-strings.cpp issue #1936 2016-07-11 09:57:30 +02:00
tri-strings.h potential performance optimizations 2016-06-23 14:47:44 +02:00
tri-zip.cpp WIP 2016-04-16 20:29:33 -07:00
tri-zip.h updated cleanupCFiles 2016-04-23 16:34:57 -07:00
vector.cpp delete TRI_vector_pointer 2016-06-07 23:08:53 +02:00
vector.h delete TRI_vector_pointer 2016-06-07 23:08:53 +02:00
voc-errors.cpp pushing corrected unittest script and cluster startup scripts 2016-08-19 09:49:44 +02:00
voc-errors.h pushing corrected unittest script and cluster startup scripts 2016-08-19 09:49:44 +02:00
voc-mimetypes.cpp pushing corrected unittest script and cluster startup scripts 2016-08-19 09:49:44 +02:00
voc-mimetypes.h
win-utils.cpp fix syntax :-( 2016-08-25 17:50:08 +02:00
win-utils.h removed some unused Windows code remainders 2016-06-07 23:08:18 +02:00
xxhash.cpp added xxHash 2016-05-02 13:46:03 +02:00
xxhash.h added xxHash 2016-05-02 13:46:03 +02:00