Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3.5' into bug-fix-3.5/restore-feature-perms

This commit is contained in:
Heiko 2019-12-02 18:13:06 +01:00 committed by GitHub
parent f6d62d9c19 a067eb567d
commit 09a323789d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -3,6 +3,8 @@ v3.5.4 (XXXX-XX-XX)
* Fixed permissions for dump/restore. * Fixed permissions for dump/restore.
* Fix execution ability in CentOS 6 regarding newer boost.
* Updated arangosync to 0.7.1. * Updated arangosync to 0.7.1.

1
CMakeLists.txt
View File

@ -1097,6 +1097,7 @@ set(LIB_ARANGO_IRESEARCH arango_iresearch)
# ZLIB_LIBS # ZLIB_LIBS
# ZLIB_INCLUDE_DIR # ZLIB_INCLUDE_DIR
add_definitions(-DBOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX=1) #fix random provider
add_definitions(-DBOOST_ALL_NO_LIB=1) #disable boost autolink on windows add_definitions(-DBOOST_ALL_NO_LIB=1) #disable boost autolink on windows
add_subdirectory(3rdParty) add_subdirectory(3rdParty)