wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-6.2' into merge-release-6.2-into-release-6.3 

# Conflicts:
#	documentation/sphinx/source/command-line-interface.rst
#	documentation/sphinx/source/release-notes.rst
#	fdbcli/fdbcli.actor.cpp
This commit is contained in:
A.J. Beamon 2020-05-27 11:42:27 -07:00
parent 59132e2cc8 e4b1489a0e
commit d6be580319
5 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
documentation/sphinx/source/old-release-notes/release-notes-620.rst
View File

@ -12,6 +12,12 @@ Fixes
* ``fdbrestore`` prefix options required exactly a single hyphen instead of the standard two. `(PR #3056) <https://github.com/apple/foundationdb/pull/3056>`_
* Commits could stall on a newly elected proxy because of inaccurate compute estimates. `(PR #3123) <https://github.com/apple/foundationdb/pull/3123>`_
Features
--------
* Added the ``getversion`` command to ``fdbcli`` which returns the current read version of the cluster. `(PR #2882) <https://github.com/apple/foundationdb/pull/2882>`_
* Added the ``advanceversion`` command to ``fdbcli`` which increases the current version of a cluster. `(PR #2965) <https://github.com/apple/foundationdb/pull/2965>`_
* Added the ``lock`` and ``unlock`` commands to ``fdbcli`` which lock or unlock a cluster. `(PR #2890) <https://github.com/apple/foundationdb/pull/2890>`_
6.2.20
======
@ -350,4 +356,4 @@ Earlier release notes
* :doc:`Beta 2 (API Version 22) </old-release-notes/release-notes-022>`
* :doc:`Beta 1 (API Version 21) </old-release-notes/release-notes-021>`
* :doc:`Alpha 6 (API Version 16) </old-release-notes/release-notes-016>`
* :doc:`Alpha 5 (API Version 14) </old-release-notes/release-notes-014>`
* :doc:`Alpha 5 (API Version 14) </old-release-notes/release-notes-014>`

6
fdbbackup/CMakeLists.txt
View File

@ -17,7 +17,11 @@ add_flow_target(EXECUTABLE NAME fdbdecode SRCS ${FDBDECODE_SRCS})
target_link_libraries(fdbdecode PRIVATE fdbclient)
if(NOT OPEN_FOR_IDE)
fdb_install(TARGETS fdbbackup DESTINATION bin COMPONENT clients)
if(GENERATE_DEBUG_PACKAGES)
fdb_install(TARGETS fdbbackup DESTINATION bin COMPONENT clients)
else()
fdb_install(FILES ${CMAKE_BINARY_DIR}/packages/bin/fdbbackup DESTINATION bin COMPONENT clients)
endif()
install_symlink(
COMPONENT clients
FILE_DIR bin

6
fdbcli/CMakeLists.txt
View File

@ -11,4 +11,8 @@ endif()
add_flow_target(EXECUTABLE NAME fdbcli SRCS ${FDBCLI_SRCS})
target_link_libraries(fdbcli PRIVATE fdbclient)
fdb_install(TARGETS fdbcli DESTINATION bin COMPONENT clients)
if(GENERATE_DEBUG_PACKAGES)
fdb_install(TARGETS fdbcli DESTINATION bin COMPONENT clients)
else()
fdb_install(FILES ${CMAKE_BINARY_DIR}/packages/bin/fdbcli DESTINATION bin COMPONENT clients)
endif()

6
fdbmonitor/CMakeLists.txt
View File

@ -10,7 +10,11 @@ endif()
# as soon as we get rid of the old build system
target_link_libraries(fdbmonitor PUBLIC Threads::Threads)
fdb_install(TARGETS fdbmonitor DESTINATION fdbmonitor COMPONENT server)
if(GENERATE_DEBUG_PACKAGES)
fdb_install(TARGETS fdbmonitor DESTINATION fdbmonitor COMPONENT server)
else()
fdb_install(FILES ${CMAKE_BINARY_DIR}/packages/bin/fdbmonitor DESTINATION fdbmonitor COMPONENT server)
endif()
# Create a local sandbox for quick manual testing without simulator
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/sandbox/data)

6
fdbserver/CMakeLists.txt
View File

@ -234,4 +234,8 @@ if (GPERFTOOLS_FOUND)
target_link_libraries(fdbserver PRIVATE gperftools)
endif()
fdb_install(TARGETS fdbserver DESTINATION sbin COMPONENT server)
if(GENERATE_DEBUG_PACKAGES)
fdb_install(TARGETS fdbserver DESTINATION sbin COMPONENT server)
else()
fdb_install(FILES ${CMAKE_BINARY_DIR}/packages/bin/fdbserver sbin COMPONENT server)
endif()