Evan Tschannen 4b5d0b4e2c Merge branch 'release-6.0' ... # Conflicts: # documentation/sphinx/source/release-notes.rst # fdbclient/AsyncFileBlobStore.actor.cpp # fdbclient/AsyncFileBlobStore.actor.h # fdbclient/BlobStore.actor.cpp # fdbclient/BlobStore.h # fdbclient/HTTP.actor.cpp # fdbclient/ManagementAPI.actor.cpp # fdbclient/NativeAPI.actor.cpp # fdbrpc/LoadBalance.actor.h # fdbrpc/batcher.actor.h # fdbrpc/fdbrpc.vcxproj # fdbrpc/sim2.actor.cpp # fdbserver/DataDistribution.actor.cpp # fdbserver/DataDistributionTracker.actor.cpp # fdbserver/SimulatedCluster.actor.cpp # fdbserver/TLogServer.actor.cpp # fdbserver/masterserver.actor.cpp		2018-11-10 13:04:24 -08:00
..
backup.actor.cpp	Merge branch 'release-6.0'	2018-11-10 13:04:24 -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