Skip to content

Conversation

@AlvinMooreSr
Copy link
Contributor

Merged Release 6.1 into local branch of master
Resolved conflict for release notes

bnamasivayam and others added 13 commits April 10, 2019 17:13
… rateLimit is set to a low value and it would take very long to read the entire database. Fix this by setting the rateLimit to the maximum allowed value if reading the entire database is taking a long time.
For small clusters that are growing quickly, it could happen that the…
do not log a SevError trace event if we cannot deserialize the connect packet
update installer WIX GUID following release
…rd-estimate-validation

Fix consistency check shard estimate validation
* Added support for testing cpack and defined very long directory name for source because of problem with building debug rpms

* Added support for building rpms by adding file package

* Added preinstall target to prevent cpack from having to do so much compilation as single thread
# Conflicts:
#	documentation/sphinx/source/release-notes.rst

* The ``consistencycheck`` fdbserver role would repeatedly exit. [6.1.1] `(PR #1437) <https://github.com/apple/foundationdb/pull/1437>`_
* The ``consistencycheck`` fdbserver role could proceed at a very slow rate after inserting data into an empty database. [6.1.2] `(PR #1452) <https://github.com/apple/foundationdb/pull/1452>`_

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem right. I think this file should match exactly the release notes on the 6.1 branch, but there are a lot of empty headers here that don't appear there. Some of these changes here are also duplicates of ones listed below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have updated these release notes. Can you verify that the 6.2 release notes look correct?

@ajbeamon ajbeamon merged commit e0f76ed into apple:master Apr 23, 2019
@AlvinMooreSr AlvinMooreSr deleted the release-6.1-merge branch May 9, 2019 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants