[Pkg-nagios-changes] [pkg-icingaweb2] 01/02: Fix merged base for 2.3.4

[Markus Frosch]

This is an automated email from the git hooks/post-receive script.

lazyfrosch pushed a commit to branch master
in repository pkg-icingaweb2.

commit f2d01895ecec7225605cf40253e448a6828a8ca4
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Tue Aug 2 12:16:31 2016 +0200

    Fix merged base for 2.3.4
    
    There had been mis-merged in the past, so the merge result is not
    correct.
---
 ChangeLog                              | 2 +-
 VERSION                                | 2 +-
 application/VERSION                    | 2 +-
 icingaweb2.spec                        | 2 +-
 library/Icinga/Application/Version.php | 2 +-
 modules/doc/module.info                | 2 +-
 modules/monitoring/module.info         | 2 +-
 modules/setup/module.info              | 2 +-
 modules/test/module.info               | 2 +-
 modules/translation/module.info        | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8559f95..132c6e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 
 ## What's New
 
-### What's New in Version 2.3.3
+### What's New in Version 2.3.4/2.3.3
 
 #### Bugfixes
 
diff --git a/VERSION b/VERSION
index fac9fc0..20dd632 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.3.3
+v2.3.4
diff --git a/application/VERSION b/application/VERSION
index f8e9d27..0c8f6ec 100644
--- a/application/VERSION
+++ b/application/VERSION
@@ -1 +1 @@
-1bbe1b36205bff70718abe78b7c5e400e862f37f 2016-06-09 16:43:06 +0200
+fc5ed3feb1ccfac97cdf66f7418bb87a1939522b 2016-06-23 14:09:55 +0200
diff --git a/icingaweb2.spec b/icingaweb2.spec
index 4880532..8a660b9 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -3,7 +3,7 @@
 %define revision 1
 
 Name:           icingaweb2
-Version:        2.3.3
+Version:        2.3.4
 Release:        %{revision}%{?dist}
 Summary:        Icinga Web 2
 Group:          Applications/System
diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php
index 493bb27..ee4dc65 100644
--- a/library/Icinga/Application/Version.php
+++ b/library/Icinga/Application/Version.php
@@ -8,7 +8,7 @@ namespace Icinga\Application;
  */
 class Version
 {
-    const VERSION = '2.3.3';
+    const VERSION = '2.3.4';
 
     /**
      * Get the version of this instance of Icinga Web 2
diff --git a/modules/doc/module.info b/modules/doc/module.info
index 8ae0d99..10d96a7 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
 Module: doc
-Version: 2.3.3
+Version: 2.3.4
 Description: Documentation module
  Extracts, shows and exports documentation for Icinga Web 2 and its modules.
diff --git a/modules/monitoring/module.info b/modules/monitoring/module.info
index 4406178..1d43bee 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
 Module: monitoring
-Version: 2.3.3
+Version: 2.3.4
 Description: Icinga monitoring module
  This is the core module for most Icingaweb users. It provides an
  abstraction layer for various Icinga data backends.
diff --git a/modules/setup/module.info b/modules/setup/module.info
index fd0a115..10729ab 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
 Module: setup
-Version: 2.3.3
+Version: 2.3.4
 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),
diff --git a/modules/test/module.info b/modules/test/module.info
index dcfd555..609fef5 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
 Module: test
-Version: 2.3.3
+Version: 2.3.4
 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.
diff --git a/modules/translation/module.info b/modules/translation/module.info
index cfc1485..817194a 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
 Module: translation
-Version: 2.3.3
+Version: 2.3.4
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icingaweb2.git