Evan Tschannen e45952bc53 Merge branch 'release-6.0' ... # Conflicts: # documentation/sphinx/source/release-notes.rst # fdbclient/BackupContainer.actor.cpp # fdbclient/BlobStore.actor.cpp # fdbclient/HTTP.actor.cpp # tests/BlobStore.txt # versions.target		2018-11-13 16:06:39 -08:00
..
bindingtester	Merge branch 'release-6.0'	2018-11-13 16:06:39 -08:00
c	Merge branch 'release-6.0'	2018-11-13 16:06:39 -08:00
flow	Bump API version to 610	2018-09-26 10:58:07 -07:00
go	Merge branch 'release-6.0'	2018-11-13 16:06:39 -08:00
java	Bump API version to 610	2018-09-26 10:58:07 -07:00
python	Update vendored Python module six	2018-10-25 23:46:49 -04:00
ruby	Merge branch 'release-6.0'	2018-11-13 16:06:39 -08:00
__init__.py	remove trailing whitespace from our copyright headers ; fixed formatting of python setup.py	2018-02-21 10:25:11 -08:00