Skip to content

Update 2.x docs for master to manager rename.#263

Merged
ctubbsii merged 2 commits intoapache:next-releasefrom
brianloss:master-manager-rename
Feb 9, 2021
Merged

Update 2.x docs for master to manager rename.#263
ctubbsii merged 2 commits intoapache:next-releasefrom
brianloss:master-manager-rename

Conversation

@brianloss
Copy link
Member

  • Update server-properties.md with updated (renamed) properties.
  • Update references to master under _docs-2 to manager (not including
    apidocs).
  • Document binary/wire incompatibility between 2.0.x and 2.1.
  • Update 2.1 release notes with specifics about master/manager renaming.

* Update server-properties.md with updated (renamed) properties.
* Update references to master under _docs-2 to manager (not including
  apidocs).
* Document binary/wire incompatibility between 2.0.x and 2.1.
* Update 2.1 release notes with specifics about master/manager renaming.
Copy link
Member

@ctubbsii ctubbsii left a comment

Choose a reason for hiding this comment

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

For the most part, looks good to me. However, we won't be able to merge this and update the 2.x docs until after 2.1 is released.

@brianloss
Copy link
Member Author

For the most part, looks good to me. However, we won't be able to merge this and update the 2.x docs until after 2.1 is released.

@ctubbsii sure, I just wanted to have the docs done. Do you think I should mark this PR as a draft, then? Or do we have some better way to leave it standing until the 2.1 release?

Copy link
Member

@ctubbsii ctubbsii left a comment

Choose a reason for hiding this comment

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

Do you think I should mark this PR as a draft, then? Or do we have some better way to leave it standing until the 2.1 release?

I think the best practice is to just leave it sit for now. We can revisit when we update the site for the 2.1 release. I think there may be another PR in that status as well. It doesn't need to be Draft or anything like that.

@ctubbsii ctubbsii changed the base branch from main to next-release February 9, 2021 23:50
@ctubbsii
Copy link
Member

ctubbsii commented Feb 9, 2021

@brianloss I created a new base branch to prep changes for the next release, so we can get them merged, and keep them rebased onto main. This one, and #232 are both in that situation at the moment. The changes you made to the Draft release notes, however, can be separated from the rest of the changes in this PR, and merged in to the main branch now. It's just the 2.x docs that can't be merged yet, so should be merged into the next-release branch instead.

@ctubbsii ctubbsii merged commit c513be3 into apache:next-release Feb 9, 2021
asfgit pushed a commit that referenced this pull request Feb 10, 2021
Incorporate changes from #232 (css/accumulo.scss)
and #263
(_posts/release/2020-01-19-accumulo-2.1.0.md) that are okay to merge
into the main branch today, leaving documentation changes staged for 2.1
in the next-release branch for merging when 2.1 is released.
asfgit pushed a commit that referenced this pull request Feb 10, 2021
* Update server-properties.md with updated (renamed) properties.
* Update references to master under _docs-2 to manager (not including
  apidocs).
* Document binary/wire incompatibility between 2.0.x and 2.1.
* Update 2.1 release notes with specifics about master/manager renaming.
@ctubbsii
Copy link
Member

I merged this and #232 into the next-release branch, extracted the pieces that could be added to the main branch now in commit b7ce444, and rebased the next-release branch onto that up-to-date main, and created a new PR to eventually merge that branch into main in #265

@brianloss
Copy link
Member Author

I merged this and #232 into the next-release branch, extracted the pieces that could be added to the main branch now in commit b7ce444, and rebased the next-release branch onto that up-to-date main, and created a new PR to eventually merge that branch into main in #265

Thanks for taking care of this!

milleruntime pushed a commit to milleruntime/accumulo-website that referenced this pull request Oct 22, 2021
* Update server-properties.md with updated (renamed) properties.
* Update references to master under _docs-2 to manager (not including
  apidocs).
* Document binary/wire incompatibility between 2.0.x and 2.1.
* Update 2.1 release notes with specifics about master/manager renaming.
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.

2 participants