add the required changes in master to devel/releasing.md

This commit is contained in:
Chao Xu 2015-12-17 10:57:55 -08:00
parent a45c87864e
commit fcca71f7d8

View File

@ -46,6 +46,7 @@ release breaks down into four pieces:
1. cutting/branching the release; 1. cutting/branching the release;
1. building and pushing the binaries; and 1. building and pushing the binaries; and
1. publishing binaries and release notes. 1. publishing binaries and release notes.
1. updating the master branch.
You should progress in this strict order. You should progress in this strict order.
@ -216,6 +217,15 @@ Finally, from a clone of upstream/master, *make sure* you still have
`RELEASE_VERSION` set correctly, and run `./build/mark-stable-release.sh `RELEASE_VERSION` set correctly, and run `./build/mark-stable-release.sh
${RELEASE_VERSION}`. ${RELEASE_VERSION}`.
### Updating the master branch
If you are cutting a new release series, please also update the master branch:
change the `latestReleaseBranch` in `cmd/mungedocs/mungedocs.go` to the new
release branch (`release-X.Y`), run `hack/update-generated-docs.sh`. This will
let the unversioned warning in docs point to the latest release series. Please
send the changes as a PR titled "Update the latestReleaseBranch to release-X.Y
in the munger".
## Injecting Version into Binaries ## Injecting Version into Binaries
*Please note that this information may be out of date. The scripts are the *Please note that this information may be out of date. The scripts are the