[Pkg-nagios-changes] [pkg-icinga-web] 01/02: Merge branch 'master' into debmon-jessie

[Markus Frosch (old DM Account)]

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

lazyfrosch-guest pushed a commit to branch debmon-jessie
in repository pkg-icinga-web.

commit 4cdc444b3c5dbf5215562233004d76dbb139e668
Merge: aabb7d2 e092bae
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Thu Aug 6 16:16:22 2015 +0200

    Merge branch 'master' into debmon-jessie

 Vagrantfile                                        |  107 +-
 .../lib/console/LocalConsoleConnection.class.php   |    8 +-
 .../Api/models/MacroExpanderModel.class.php        |    4 +-
 .../Api/models/Views/ApiDQLViewModel.class.php     |   75 +-
 .../lib/js/admin/components/UserListingGrid.js     |    4 +-
 .../Cronks/config/{module.xml => module.xml.in}    |   20 +-
 .../Cronks/lib/js/Cronk/grid/CommandHandler.js     |   37 +-
 .../DQLCronkTemplateWorker.class.php               |   48 +-
 .../System/ObjectSearchResultModel.class.php       |   22 +-
 app/templates/ExtJsViewport.php                    |    2 +-
 configure                                          | 1784 ++++++++++----------
 configure.ac                                       |    7 +-
 debian/changelog                                   |    7 +
 debian/copyright                                   |  202 +--
 debian/rules                                       |    1 +
 debian/source.lintian-overrides                    |    3 +
 doc/CHANGELOG-1.13                                 |   17 +
 doc/THANKS                                         |    1 +
 doc/VERSION                                        |    2 +-
 etc/conf.d/module_cronks.xml                       |    6 +-
 etc/make/version.m4                                |    4 +-
 21 files changed, 1165 insertions(+), 1196 deletions(-)

diff --cc debian/changelog
index c8c1d01,e624840..9a2eb56
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ icinga-web (1.13.1-1) unstable; urgency=medium
+ 
+   * [495cb9e] Imported Upstream version 1.13.1
+   * [ac6701d] Update copyright and lintian
+ 
+  -- Markus Frosch <lazyfrosch at debian.org>  Thu, 06 Aug 2015 15:56:56 +0200
+ 
 +icinga-web (1.13.0-1~debmon80+1) debmon-jessie; urgency=medium
 +
 +  * Rebuild for debmon-jessie
 +
 + -- Alexander Wirt <formorer at debian.org>  Tue, 09 Jun 2015 11:30:43 +0200
 +
  icinga-web (1.13.0-1) unstable; urgency=medium
  
    * [14cee09] Imported Upstream version 1.13.0

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