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

Release version 2.6.2

This commit is contained in:
Gunnar Beutner 2017-02-13 10:51:27 +01:00
parent 245cb0e930
commit 975f78f562
4 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -4,6 +4,17 @@ Please check [doc/1-about.md].
## What's New ## What's New
### What's New in Version 2.6.2
#### Changes
This is a bugfix release which addresses a crash that can occur when removing
configuration files for objects which have been deleted via the API.
#### Bugfixes
* Bug 4952 (API): Icinga crashes while trying to remove configuration files for objects which no longer exist
### What's New in Version 2.6.1 ### What's New in Version 2.6.1
#### Changes #### Changes

39
RELEASE.md
View File

@ -4,7 +4,7 @@ Print this document.
Specify the release version. Specify the release version.
VERSION=2.6.1 VERSION=2.6.2
## Issues ## Issues
@ -12,22 +12,8 @@ Check issues at https://github.com/Icinga/icinga2
## Backport Commits ## Backport Commits
$ git checkout master For minor versions you need to manually backports any and all commits from the
$ ./pick.py -V $VERSION master branch which should be part of this release.
The script creates a new branch 'auto-merged-<VERSION>' which is based on the
current support branch. It then merges all commits from the 'master' branch which
reference a ticket for the version that was specified.
If there are any merge commits you will need to manually fix them and continue the
rebase until no commits are left:
$ git rebase --continue
After finishing the rebase the branch needs to be merged into the support branch:
$ git checkout support/2.6
$ git merge --ff-only auto-merged-2.6.1
## Authors ## Authors
@ -48,21 +34,8 @@ Example:
## Changelog ## Changelog
Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) files using Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) files. Also generate HTML
the changelog.py script. Also generate HTML for the wordpress release announcement. for the wordpress release announcement.
You need to copy and paste the output manually.
Changelog:
$ ./changelog.py -V $VERSION
Docs:
$ ./changelog.py -V $VERSION -l
Wordpress:
$ ./changelog.py -V $VERSION -H -l
## Git Tag ## Git Tag
@ -146,7 +119,7 @@ Create the nupkg package:
Install the created icinga2 package locally: Install the created icinga2 package locally:
choco install icinga2 -version 2.6.1 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'" choco install icinga2 -version 2.6.2 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
Upload the package to [chocolatey](https://chocolatey.org/packages/upload). Upload the package to [chocolatey](https://chocolatey.org/packages/upload).

11
doc/1-about.md
View File

@ -44,6 +44,17 @@ file.
## <a id="whats-new"></a> What's New ## <a id="whats-new"></a> What's New
### What's New in Version 2.6.2
#### Changes
This is a bugfix release which addresses a crash that can occur when removing
configuration files for objects which have been deleted via the API.
#### Bugfixes
* Bug 4952 (API): Icinga crashes while trying to remove configuration files for objects which no longer exist
### What's New in Version 2.6.1 ### What's New in Version 2.6.1
#### Changes #### Changes

2
icinga2.spec
View File

@ -66,7 +66,7 @@
Summary: Network monitoring application Summary: Network monitoring application
Name: icinga2 Name: icinga2
Version: 2.6.1 Version: 2.6.2
Release: %{revision}%{?dist} Release: %{revision}%{?dist}
License: GPL-2.0+ License: GPL-2.0+
Group: Applications/System Group: Applications/System