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

[Markus Frosch]

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

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

commit caf2ce78cc9e77be634aa6d4d6313bf59c8566bf
Merge: c73b1cc f0d18c2
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Mon Oct 7 16:27:12 2013 +0200

    Merge branch 'master' into debmon-wheezy
    
    Conflicts:
    	debian/changelog

 app/modules/Api/actions/ApiCommandAction.class.php |   10 ++
 app/modules/Api/config/views/hostgroups.xml        |    9 +-
 ...ngaApiAuthentificationRoutingCallback.class.php |    8 +-
 .../lib/database/IcingaDoctrine_Query.class.php    |    4 +-
 .../models/generated/BaseIcingaHostgroups.php      |   10 +-
 .../AppKit/templates/Admin/ViewLogsSuccess.php     |    4 +-
 .../Cronks/lib/js/Cronk/grid/MetaGridPanel.js      |    9 +-
 .../lib/js/Cronk/grid/columns/ComponentFrame.js    |   50 ++++----
 .../lib/js/Cronk/grid/plugins/RowActionPanel.js    |    2 -
 .../lib/js/Cronk/grid/renderer/ColumnRenderer.js   |   25 +++-
 .../Cronks/lib/js/Cronk/util/CronkBuilder.js       |    6 +-
 .../Cronks/lib/js/Cronk/util/CronkTabhelper.js     |    5 +-
 app/modules/Cronks/lib/js/Cronk/util/CronkUtil.js  |   36 ++++--
 .../js/Icinga/Cronks/System/CronkListingPanel.js   |  131 +++++++++++++-------
 .../lib/js/Icinga/Cronks/util/FilterEditor.js      |    3 +
 .../models/System/CommandSenderModel.class.php     |    3 +-
 .../System/StaticContentTemplateModel.class.php    |    6 +-
 .../System/ViewProcFilterParamsModel.class.php     |    4 +
 app/modules/Cronks/validate/System/CronkPortal.xml |    9 +-
 app/modules/Cronks/validate/System/PortalView.xml  |    6 +
 .../views/System/CronkPortalSuccessView.class.php  |    1 +
 app/modules/Reporting/config/module.xml.in         |    5 +
 ...nga.Reporting.inputControl.ApiSelectionField.js |   22 +++-
 .../principal/IcingaPrincipalTargetTool.class.php  |   22 ++--
 app/modules/Web/validate/Icinga/PortalView.xml     |   10 +-
 configure                                          |   20 +--
 debian/changelog                                   |    7 ++
 doc/CHANGELOG-1.9                                  |   34 +++++
 doc/VERSION                                        |    2 +-
 etc/make/version.m4                                |    4 +-
 icinga-web.spec                                    |    8 +-
 31 files changed, 324 insertions(+), 151 deletions(-)

diff --cc debian/changelog
index 8455896,c3a7f11..0d3c2d6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ icinga-web (1.9.2+dfsg1-1) unstable; urgency=low
+ 
+   * [d02e61f] Imported Upstream version 1.9.2
+   * [aae265c] DFSG cleaned upstream version 1.9.2+dfsg1
+ 
+  -- Markus Frosch <markus at lazyfrosch.de>  Mon, 07 Oct 2013 15:59:59 +0200
+ 
 +icinga-web (1.9.1+dfsg1-1~debmon7+1) debmon-wheezy; urgency=low
 +
 +  * Rebuild for debmon-wheezy
 +
 + -- Markus Frosch <markus at lazyfrosch.de>  Sun, 08 Sep 2013 19:14:40 +0200
 +
  icinga-web (1.9.1+dfsg1-1) unstable; urgency=low
  
    * [08222f1] Imported Upstream version 1.9.1

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