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 <[email protected]> <[email protected]>
Alexander A. Klimov <[email protected]> <[email protected]>
Alexander A. Klimov <[email protected]> <[email protected]>
Bernd Erk <[email protected]> <[email protected]>
Bernd Erk <[email protected]><[email protected]>
Bernd Erk <[email protected]><[email protected]>
Expand All @@ -13,15 +14,17 @@ Eric Lippmann <[email protected]> <[email protected]>
Florian Strohmaier <[email protected]> <[email protected]>
Florian Strohmaier <[email protected]> <[email protected]>
Gunnar Beutner <[email protected]> <[email protected]>
Johannes Meyer <[email protected]> <[email protected]>
Jannis Moßhammer <[email protected]>
Johannes Meyer <[email protected]> <[email protected]>
Jennifer Mourek <[email protected]> <[email protected]>
Markus Frosch <[email protected]> <[email protected]>
Markus Frosch <[email protected]> <[email protected]>
Markus Frosch <[email protected]> <[email protected]>
Matthias Jentsch <[email protected]> <[email protected]>
Michael Friedrich <[email protected]> <[email protected]>
Michael Friedrich <[email protected]> <[email protected]>
Michael Friedrich <[email protected]> <[email protected]>
Nicolai Buchwitz <[email protected]> <[email protected]>
Noah Hilverling <[email protected]> <[email protected]>
Sylph Lin <[email protected]>
Thomas Gelf <[email protected]> <[email protected]>
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 <[email protected]>
Heike Jurzik <[email protected]>
Ian Shearin <[email protected]>
Jannis Moßhammer <[email protected]>
Jennifer Mourek <jennifer.mourek@netways.de>
Jennifer Mourek <jennifer.mourek@icinga.com>
Jo Rhett <[email protected]>
Joe Doherty <[email protected]>
Johannes Meyer <[email protected]>
Joonas Kylmälä <[email protected]>
Ken Jungclaus <[email protected]>
Klaus Jrgensen <[email protected]>
Lee Clemens <[email protected]>
Louis Sautier <[email protected]>
Marc DeTrano <[email protected]>
Expand All @@ -41,8 +43,10 @@ Marius Hein <[email protected]>
Markus Frosch <[email protected]>
Matthias Jentsch <[email protected]>
Michael Friedrich <[email protected]>
Mikesch-mp <[email protected]>
Mikko Peltokangas <[email protected]>
Munzir Taha <[email protected]>
Nicolai Buchwitz <[email protected]>
Noah Hilverling <[email protected]>
Paul Richards <[email protected]>
Pavlos Daoglou <[email protected]>
Expand All @@ -54,22 +58,27 @@ Roland Hopferwieser <[email protected]>
Rune Darrud <[email protected]>
Russell Kubik <[email protected]>
Sander Ferdinand <[email protected]>
Simone Orsi <[email protected]>
Susanne Vestner-Ludwig <[email protected]>
Sylph Lin <[email protected]>
Thomas Gelf <[email protected]>
Tim Helfensdörfer <[email protected]>
Tobias von der Krone <[email protected]>
Tom Ford <[email protected]>
Tomas Barton <[email protected]>
Ulf Lange <[email protected]>
Uwe Ebel <[email protected]>
Vladislav Ponomarev <[email protected]>
Yuri Konotopov <[email protected]>
ayoubabid <[email protected]>
baufrecht <[email protected]>
bradynathan <[email protected]>
cstegm <[email protected]>
hailthemelody@rm-laptop04 <hailthemelody@rm-laptop04>
mbaschnitzi <[email protected]>
rbelinsky <[email protected]>
realitygaps <[email protected]>
rkcpi <[email protected]>
ss23 <[email protected]>
tfylling <[email protected]>
xert <[email protected]>
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.