Evan Tschannen 303df197cf Merge branch 'release-6.2' ...

# Conflicts:
#	CMakeLists.txt
#	bindings/c/test/mako/mako.c
#	documentation/sphinx/source/release-notes.rst
#	fdbbackup/backup.actor.cpp
#	fdbclient/NativeAPI.actor.cpp
#	fdbclient/NativeAPI.actor.h
#	fdbserver/DataDistributionQueue.actor.cpp
#	fdbserver/Knobs.cpp
#	fdbserver/Knobs.h
#	fdbserver/LogRouter.actor.cpp
#	fdbserver/SkipList.cpp
#	fdbserver/fdbserver.actor.cpp
#	flow/CMakeLists.txt
#	flow/Knobs.cpp
#	flow/Knobs.h
#	flow/flow.vcxproj
#	flow/flow.vcxproj.filters
#	versions.target

2020-03-06 18:22:46 -08:00

..

sphinx

Merge branch 'release-6.2'

2020-03-06 18:22:46 -08:00

tutorial

addressed review comments

2019-11-13 17:26:01 -08:00

CMakeLists.txt

SimpleHTTPServer -> http.server for CMake

2020-02-21 12:31:46 +05:30

FDB_logo.png

Add logo to readme

2018-04-18 15:03:27 -07:00

Makefile

Use python3 in docpreview make target. The SimpleHTTPServer module is called http.server in python3, so if we don't explicitly choose a version it won't work if our python alias isn't the expected version.

2020-01-21 15:08:34 -08:00