[pkg-bacula-commits] [bacula] 01/02: 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 51a99836f4d51d4c589cf71d17f7d0d65ef8c6e2
Merge: a401f3b f71e109
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Mar 20 17:05:11 2017 +0100

    Merge branch 'upstream'

 ChangeLog            |  11 +-
 ReleaseNotes         |  20 +-
 src/baconfig.h       |  10 +-
 src/cats/cats.h      |   4 +-
 src/dird/job.c       |   4 +-
 src/dird/ua_cmds.c   |  28 +--
 src/dird/ua_query.c  |  29 ++-
 src/filed/backup.c   | 612 ++++++++++++++++++++++++++-------------------------
 src/filed/job.c      |   2 +-
 src/filed/restore.c  |  21 +-
 src/filed/xacl.c     |   7 +-
 src/findlib/fstype.c |   3 +-
 src/lib/bnet.c       |   6 +-
 src/lib/mem_pool.c   |   3 +-
 src/stored/fd_cmds.c |   3 +-
 src/stored/lock.c    |  62 +++---
 src/version.h        |   8 +-
 17 files changed, 443 insertions(+), 390 deletions(-)

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