Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] update changelog (#925) #930

Closed
wants to merge 1 commit into from

Conversation

ebeahan
Copy link
Member

@ebeahan ebeahan commented Aug 13, 2020

Forwardports the following commits to master:

Using #925 over #923 since the changes will be present in all three branches (1.6, 1.x, and master) and #925 has the most recent CHANGELOG.

# Conflicts:
#	generated/csv/fields.csv
@ebeahan ebeahan changed the title [master] [1.6] add related.hosts (#913) (#925) [master] [1.6] update changelog (#913) (#925) Aug 13, 2020
@ebeahan ebeahan self-assigned this Aug 13, 2020
@ebeahan ebeahan changed the title [master] [1.6] update changelog (#913) (#925) [master] update changelog (#925) Aug 13, 2020
Copy link
Contributor

@webmat webmat left a comment

Choose a reason for hiding this comment

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

This PR will need to be adjusted to include this adjustment:

No need to adjust now. If we find there's more adjustments until the release, we can also close this PR and forward port only the final 1.6 changelog.

@ebeahan ebeahan added the ready Issues we'd like to address in the future. label Aug 18, 2020
@ebeahan ebeahan closed this Aug 25, 2020
@ebeahan ebeahan deleted the backport/master/pr-925 branch August 25, 2020 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
forward_port ready Issues we'd like to address in the future.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants