Skip to content

Commit

Permalink
Merge pull request #3164 from Icinga/prepare-v2.5.0
Browse files Browse the repository at this point in the history
Prepare release version 2.5.0
  • Loading branch information
lippserd authored Nov 27, 2017
2 parents 4937f30 + e376b13 commit ebe1917
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 9 deletions.
5 changes: 4 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Alexander A. Klimov <alexander.klimov@icinga.com> <Alexander.Klimov@netways.de>
Alexander A. Klimov <alexander.klimov@icinga.com> <alexander.klimov@netways.de>
Alexander A. Klimov <alexander.klimov@icinga.com> <Al2Klimov@users.noreply.github.com>
Bernd Erk <bernd.erk@icinga.com> <bernd.erk@netways.de>
Bernd Erk <bernd.erk@icinga.com><berk@nb-berk.int.netways.de>
Bernd Erk <bernd.erk@icinga.com><berk@nb-berk.local>
Expand All @@ -13,15 +14,17 @@ Eric Lippmann <eric.lippmann@icinga.com> <lippserd@googlemail.com>
Florian Strohmaier <florian.strohmaier@icinga.com> <florian.strohmaier@netways.de>
Florian Strohmaier <florian.strohmaier@icinga.com> <hello@florianstrohmaier.com>
Gunnar Beutner <gunnar.beutner@netways.de> <gunnar@beutner.name>
Johannes Meyer <johannes.meyer@icinga.com> <johannes.meyer@netways.de>
Jannis Moßhammer <jannis.mosshammer@netways.de>
Johannes Meyer <johannes.meyer@icinga.com> <johannes.meyer@netways.de>
Jennifer Mourek <jennifer.mourek@icinga.com> <jennifer.mourek@netways.de>
Markus Frosch <markus.frosch@icinga.com> <lazyfrosch@icinga.org>
Markus Frosch <markus.frosch@icinga.com> <markus.frosch@netways.de>
Markus Frosch <markus.frosch@icinga.com> <markus@lazyfrosch.de>
Matthias Jentsch <matthias.jentsch@netways.de> <mjentsch@localhost.int.netways.de>
Michael Friedrich <michael.friedrich@icinga.com> <Michael.Friedrich@netways.de>
Michael Friedrich <michael.friedrich@icinga.com> <michael.friedrich@gmail.com>
Michael Friedrich <michael.friedrich@icinga.com> <michael.friedrich@netways.de>
Nicolai Buchwitz <nicolai.buchwitz@enda.eu> <nbuchwitz@users.noreply.github.com>
Noah Hilverling <noah.hilverling@icinga.com> <noah.hilverling@netways.de>
Sylph Lin <sylph.lin@gmail.com>
Thomas Gelf <thomas.gelf@icinga.com> <root@squeeze-devel1.osmc.lab>
Expand Down
11 changes: 10 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ Hector Sanjuan <hector.sanjuan@nugg.ad>
Heike Jurzik <huhn@lion-3.fritz.box>
Ian Shearin <ishearin@womply.com>
Jannis Moßhammer <jannis.mosshammer@netways.de>
Jennifer Mourek <jennifer.mourek@netways.de>
Jennifer Mourek <jennifer.mourek@icinga.com>
Jo Rhett <jo@chegg.com>
Joe Doherty <git@pjuu.com>
Johannes Meyer <johannes.meyer@icinga.com>
Joonas Kylmälä <joonas.kylmala@kirjastot.fi>
Ken Jungclaus <lum33n@web.de>
Klaus Jrgensen <klaus@blackwoodseven.com>
Lee Clemens <java@leeclemens.net>
Louis Sautier <sautier.louis@gmail.com>
Marc DeTrano <marc@gridshield.net>
Expand All @@ -41,8 +43,10 @@ Marius Hein <marius.hein@netways.de>
Markus Frosch <markus.frosch@icinga.com>
Matthias Jentsch <matthias.jentsch@netways.de>
Michael Friedrich <michael.friedrich@icinga.com>
Mikesch-mp <Mikesch-mp@koebbes.de>
Mikko Peltokangas <mikko@peltokangas.org>
Munzir Taha <munzirtaha@gmail.com>
Nicolai Buchwitz <nicolai.buchwitz@enda.eu>
Noah Hilverling <noah.hilverling@icinga.com>
Paul Richards <paul@minimoo.org>
Pavlos Daoglou <pdaoglou@gmail.com>
Expand All @@ -54,22 +58,27 @@ Roland Hopferwieser <rhopfer@ica.jku.at>
Rune Darrud <theflyingcorpse@gmail.com>
Russell Kubik <russkubik@3d-p.com>
Sander Ferdinand <sa.ferdinand@gmail.com>
Simone Orsi <simahawk@users.noreply.github.com>
Susanne Vestner-Ludwig <susanne.vestner-ludwig@inserteffect.com>
Sylph Lin <sylph.lin@gmail.com>
Thomas Gelf <thomas.gelf@icinga.com>
Tim Helfensdörfer <tim@visualappeal.de>
Tobias von der Krone <tobias.vonderkrone@profitbricks.com>
Tom Ford <exptom@users.noreply.github.com>
Tomas Barton <barton.tomas@gmail.com>
Ulf Lange <mopp@gmx.net>
Uwe Ebel <kobmaki@aol.com>
Vladislav Ponomarev <vponomarev@team.mobile.de>
Yuri Konotopov <ykonotopov@gmail.com>
ayoubabid <ayoubabid@users.noreply.github.com>
baufrecht <baufrecht@users.noreply.github.com>
bradynathan <bradynathan@gmail.com>
cstegm <cstegm@users.noreply.github.com>
hailthemelody@rm-laptop04 <hailthemelody@rm-laptop04>
mbaschnitzi <mbaschnitzi@users.noreply.github.com>
rbelinsky <rbelinsky@dalet.com>
realitygaps <github@gapsinreality.com>
rkcpi <thieme.sandra@gmail.com>
ss23 <stephen@zxsecurity.co.nz>
tfylling <torbfylling@gmail.com>
xert <xert@users.noreply.github.com>
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.4.2
v2.5.0
2 changes: 1 addition & 1 deletion library/Icinga/Application/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
class Version
{
const VERSION = '2.4.2';
const VERSION = '2.5.0';

/**
* Get the version of this instance of Icinga Web 2
Expand Down
2 changes: 1 addition & 1 deletion modules/doc/module.info
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Module: doc
Version: 2.4.2
Version: 2.5.0
Description: Documentation module
Extracts, shows and exports documentation for Icinga Web 2 and its modules.
2 changes: 1 addition & 1 deletion modules/monitoring/module.info
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Module: monitoring
Version: 2.4.2
Version: 2.5.0
Description: Icinga monitoring module
This is the core module for most Icingaweb users. It provides an
abstraction layer for various Icinga data backends.
2 changes: 1 addition & 1 deletion modules/setup/module.info
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Module: setup
Version: 2.4.2
Version: 2.5.0
Description: Setup module
Web based wizard for setting up Icinga Web 2 and its modules.
This includes the data backends (e.g. relational database, LDAP),
Expand Down
2 changes: 1 addition & 1 deletion modules/test/module.info
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Module: test
Version: 2.4.2
Version: 2.5.0
Description: Translation module
This module allows developers to run (unit) tests against Icinga Web 2 and
any of its modules. Usually you do not need to enable this.
2 changes: 1 addition & 1 deletion modules/translation/module.info
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Module: translation
Version: 2.4.2
Version: 2.5.0
Description: Translation module
This module allows developers and translators to translate Icinga Web 2 and
its modules for multiple languages. You do not need this module to run an
Expand Down

0 comments on commit ebe1917

Please sign in to comment.