Evan Tschannen 0217aed74c Merge branch 'release-6.0' ...

# Conflicts:
#	bindings/go/README.md
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/MasterProxyServer.actor.cpp
#	versions.target

2018-10-15 18:38:51 -07:00

..

backup.actor.cpp

Merge branch 'release-6.0'

2018-10-15 18:38:51 -07: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