tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update version in RELEASE.md 

refs #10693
This commit is contained in:
Michael Friedrich 2015-11-16 10:57:03 +01:00
parent 0824d9c901
commit ac7f4fada8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
RELEASE.md
View File

@ -26,15 +26,15 @@ the changelog.py script. Also generate HTML for the wordpress release announceme
Changelog: Changelog:
$ ./changelog.py --version 2.3.11 --project i2 $ ./changelog.py --version 2.4.0 --project i2
Docs: Docs:
$ ./changelog.py --version 2.3.11 --project i2 --links $ ./changelog.py --version 2.4.0 --project i2 --links
Wordpress: Wordpress:
$ ./changelog.py --version 2.3.11 --project i2 --html --links $ ./changelog.py --version 2.4.0 --project i2 --html --links
## Git Tag ## Git Tag
@ -62,16 +62,16 @@ Push the tag.
For major releases: Create a new "support" branch: For major releases: Create a new "support" branch:
$ git checkout master $ git checkout master
$ git checkout -b support/2.3 $ git checkout -b support/2.4
$ git push -u origin support/2.3 $ git push -u origin support/2.4
For minor releases: Push the support branch, cherry-pick the release commit For minor releases: Push the support branch, cherry-pick the release commit
into master and merge the support branch: into master and merge the support branch:
$ git push -u origin support/2.3 $ git push -u origin support/2.4
$ git checkout master $ git checkout master
$ git cherry-pick support/2.3 $ git cherry-pick support/2.4
$ git merge --strategy=ours support/2.3 $ git merge --strategy=ours support/2.4
$ git push origin master $ git push origin master
# External Dependencies # External Dependencies