[pkg-bacula-commits] [bacula] 02/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 25a49ec4fbe4e76c838291e6c3da2390552675e3
Merge: 4615db6 227fc2c
Author: Carsten Leonhardt <leo at debian.org>
Date:   Wed Jun 1 16:20:06 2016 +0200

    Merge branch 'upstream'

 .gitignore                                    | 11 ++++
 ChangeLog                                     | 61 +++++++++++++++++++++-
 ReleaseNotes                                  | 33 +++++++++++-
 src/c                                         |  2 +-
 src/cats/make_catalog_backup.in               |  7 +--
 src/cats/make_mysql_tables.in                 | 34 ++++++-------
 src/cats/sql_list.c                           | 16 +++---
 src/dird/mac.c                                | 29 +++++++++--
 src/dird/restore.c                            |  4 ++
 src/dird/ua_cmds.c                            |  2 +-
 src/dird/ua_run.c                             |  2 +-
 src/dird/ua_update.c                          | 28 ++++++----
 src/filed/acl.c                               |  2 +-
 src/filed/filed_conf.c                        |  2 +-
 src/jcr.h                                     |  2 +-
 src/lib/alist.c                               |  3 ++
 src/lib/bsock.c                               |  2 +-
 src/lib/mem_pool.c                            |  8 +--
 src/lib/smartall.h                            |  8 +--
 src/qt-console/medialist/medialist.cpp        |  2 +-
 src/version.h                                 |  4 +-
 updatedb/update_mysql_tables.in               |  3 --
 updatedb/update_mysql_tables_12_to_13.in      | 53 -------------------
 updatedb/update_mysql_tables_13_to_14.in      | 37 --------------
 updatedb/update_postgresql_tables.in          |  2 +-
 updatedb/update_postgresql_tables_12_to_13.in | 53 -------------------
 updatedb/update_postgresql_tables_13_to_14.in | 38 --------------
 updatedb/update_sqlite3_tables.in             | 73 +++++++++++++++++++++++----
 28 files changed, 263 insertions(+), 258 deletions(-)

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