[pkg-bacula-commits] [bacula] 01/05: Merge branch 'upstream'

[Carsten Leonhardt]

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

leo pushed a commit to branch master
in repository bacula.

commit b5490898004faea96cdb0a14c8743996030f79e6
Merge: b833268 1dadc2c
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Jul 11 11:52:54 2016 +0200

    Merge branch 'upstream'

 ChangeLog                                 |  30 +++-
 ReleaseNotes                              |  24 ++-
 autoconf/bacula-macros/db.m4              | 256 ++++++++++++++++--------------
 autoconf/configure.in                     |   2 +-
 configure                                 | 242 +++++++++++++++-------------
 src/cats/create_sqlite3_database.in.patch |  11 --
 src/cats/grant_mysql_privileges.patch     |  13 --
 src/cats/make_catalog_backup.in.patch     |  13 --
 src/cats/sql.c                            |   6 +-
 src/cats/update_sqlite3_tables.in.patch   |  12 --
 src/dird/job.c                            |   6 +-
 src/dird/ua_cmds.c                        |   4 +-
 src/dird/ua_select.c                      |   6 +-
 src/dird/ua_status.c                      |   2 +-
 src/jcr.h                                 |   1 +
 src/stored/dircmd.c                       |   2 +-
 src/version.h                             |   6 +-
 17 files changed, 343 insertions(+), 293 deletions(-)

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