Evan Tschannen 684a22a52b Merge branch 'release-6.0' ... # Conflicts: # documentation/sphinx/source/release-notes.rst # fdbbackup/backup.actor.cpp # fdbclient/BackupContainer.actor.cpp # fdbclient/HTTP.actor.cpp # fdbserver/storageserver.actor.cpp # fdbserver/workloads/BackupCorrectness.actor.cpp # versions.target		2019-01-09 16:14:46 -08:00
..
CMakeLists.txt	First version of working rpm packages	2018-12-13 15:55:31 -08:00
backup.actor.cpp	Merge branch 'release-6.0'	2019-01-09 16:14:46 -08:00
fdbbackup.vcxproj	Changed the TLS_DISABLED macro	2018-06-26 12:08:32 -07:00
local.mk	Fix not depending on FDBLibTLS.a and default TLS_LIBDIR to a sensible place.	2018-07-05 13:23:20 -07:00