[Pkg-nagios-changes] [pkg-lconf] 03/09: Merge tag 'upstream/1.4.2'

[Markus Frosch]

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

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

commit 8b398b466b509aa9c75964d9031094f7effc7cf1
Merge: 28d66bd 341a17b
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Aug 5 18:30:13 2014 +0200

    Merge tag 'upstream/1.4.2'
    
    Upstream version 1.4.2
    
    # gpg: Signature made Di 05 Aug 2014 18:30:13 CEST using RSA key ID 04A4ED27
    # gpg: Good signature from "Markus Frosch <markus at lazyfrosch.de>"
    # gpg:                 aka "Markus Frosch (Icinga) <lazyfrosch at icinga.org>"
    # gpg:                 aka "Markus Frosch (NETWAYS) <markus.frosch at netways.de>"
    # gpg:                 aka "Markus Frosch (Debian) <lazyfrosch at debian.org>"

 .gitignore                                         |    7 +
 LConf.spec                                         |   55 +-
 Makefile.in                                        |  328 +++--
 configure                                          |  103 +-
 configure.ac                                       |   32 +-
 contrib/LConfDeploy.sh.in                          |    4 +
 ...{LConfDeploy.sh.in => LConfDeployIcinga2.sh.in} |   67 +-
 doc/CHANGELOG                                      |   66 +
 doc/INSTALL                                        |   52 +
 doc/UPGRADING                                      |   35 +
 m4/version.m4                                      |    4 +-
 make-tarball                                       |  196 ---
 maketar.sh                                         |   18 -
 src/LConfExport.pl.in                              |   46 +-
 src/LConfImport.pl.in                              |    4 +-
 src/LConfSlaveExport.pl.in                         |   44 +-
 src/LConfSlaveExportRules.pl.in                    |  120 +-
 src/LConfSlaveSync.pl.in                           |    2 +-
 src/config.pm.in                                   |  135 +-
 src/default-templates.cfg.in                       |   17 +-
 src/default-templates.conf.in                      |  100 ++
 src/generate.pm.in                                 | 1369 ++++++++++++++++++--
 src/ldap.pm.in                                     |  342 +++--
 src/misc.pm.in                                     |  374 +++++-
 tools/createdb                                     |   18 +
 tools/createdb.ldif                                |   20 +
 26 files changed, 2840 insertions(+), 718 deletions(-)


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