[Pkg-nagios-changes] [pkg-icingaweb2] 01/02: Merge branch 'master' into ubuntu

[Alexander Wirt]

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

formorer pushed a commit to branch ubuntu
in repository pkg-icingaweb2.

commit a85552a1e61a5246b5769127c03c7fc5bd78a97d
Merge: 085c4e3 82386a4
Author: Alexander Wirt <formorer at debian.org>
Date:   Tue May 17 15:13:02 2016 +0200

    Merge branch 'master' into ubuntu

 ChangeLog                                          |  14 +++++++++++++
 VERSION                                            |   2 +-
 application/VERSION                                |   2 +-
 debian/changelog                                   |  10 ++++++++--
 icingaweb2.spec                                    |   2 +-
 library/Icinga/Application/Version.php             |   2 +-
 library/Icinga/Repository/Repository.php           |   5 +++--
 library/Icinga/Web/Form/Element/DateTimePicker.php |  12 ++++++++++-
 library/Icinga/Web/Navigation/DashboardPane.php    |  22 +++++++++++++++++++++
 library/Icinga/Web/Navigation/NavigationItem.php   |  16 ++++++++++++++-
 library/Icinga/Web/Widget/Dashboard.php            |  11 +++++++++--
 library/Icinga/Web/Widget/FilterEditor.php         |  12 ++++++-----
 modules/doc/module.info                            |   2 +-
 .../application/controllers/ConfigController.php   |  20 ++++++++++++++++---
 .../Object/ScheduleHostDowntimeCommandForm.php     |  17 ++++++++++++++++
 .../Object/ScheduleServiceDowntimeCommandForm.php  |  16 +++++++++++++++
 .../locale/de_DE/LC_MESSAGES/monitoring.mo         | Bin 75289 -> 72184 bytes
 .../locale/de_DE/LC_MESSAGES/monitoring.po         |  13 ++++++++----
 .../views/scripts/list/eventhistory.phtml          |   8 +++++++-
 .../views/scripts/partials/event-history.phtml     |  15 +++++++++++++-
 modules/monitoring/module.info                     |   2 +-
 modules/setup/module.info                          |   2 +-
 modules/test/module.info                           |   2 +-
 modules/translation/module.info                    |   2 +-
 24 files changed, 178 insertions(+), 31 deletions(-)

diff --cc debian/changelog
index 33fba28,e4b0dd7..1504113
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,21 @@@
- icingaweb2 (2.3.1-1~ppa2) trusty; urgency=medium
++icingaweb2 (2.3.2-1~ppa2) trusty; urgency=medium
 +
 +  * Fix php version on xenial 
 +
 + -- Alexander Wirt <formorer at debian.org>  Tue, 17 May 2016 15:05:21 +0200
 +
- icingaweb2 (2.3.1-1~ppa1) trusty; urgency=medium
++icingaweb2 (2.3.2-1~ppa1) trusty; urgency=medium
 +
 +  * Updated for my ppa
 +
 + -- Alexander Wirt <formorer at debian.org>  Mon, 22 Feb 2016 13:21:45 +0100
 +
+ icingaweb2 (2.3.2-1) unstable; urgency=medium
+ 
+   * [c1aee5d] Imported Upstream version 2.3.2
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Thu, 28 Apr 2016 18:19:00 +0200
+ 
  icingaweb2 (2.3.1-1) unstable; urgency=medium
  
    * [3c80e44] Imported Upstream version 2.3.1

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