[pkg-bacula-commits] [bacula] 01/03: 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 af54598b3cfc14dcb6352e0e46938351a0b72000
Merge: ddb1398 76629b9
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Feb 27 14:58:52 2017 +0100

    Merge branch 'upstream'

 .gitignore                                |   47 +-
 AUTHORS                                   |    1 +
 ChangeLog                                 |   36 +-
 ReleaseNotes                              |   26 +-
 po/POTFILES.in                            |    8 +-
 po/bacula.pot                             |   39 +-
 po/de.po                                  |   57 +-
 po/es.po                                  |   78 +-
 po/fr.po                                  |   52 +-
 po/nl.po                                  |   39 +-
 po/sv.po                                  |   39 +-
 po/uk.po                                  |   45 +-
 scripts/logwatch/Makefile.in              |   17 +-
 src/c                                     |    2 +-
 src/cats/sql_list.c                       |    4 +-
 src/console/console_conf.c                |    6 +-
 src/dird/bacula-dir.conf.in               |    4 +-
 src/dird/dird_conf.c                      |   25 +-
 src/dird/ua_purge.c                       |    2 +-
 src/dird/ua_run.c                         |    5 -
 src/dird/ua_status.c                      |   40 +-
 src/filed/Makefile.in                     |    9 +-
 src/filed/acl.c                           | 2209 -----------------
 src/filed/acl.h                           |   66 -
 src/filed/backup.c                        |  689 +++---
 src/filed/filed.h                         |   35 +-
 src/filed/filed_conf.c                    |    8 +-
 src/filed/protos.h                        |   14 +-
 src/filed/restore.c                       |  264 +--
 src/filed/xacl.c                          | 1332 +++++++++++
 src/filed/xacl.h                          |  308 +++
 src/filed/xacl_freebsd.c                  |  946 ++++++++
 src/filed/xacl_freebsd.h                  |   95 +
 src/filed/xacl_linux.c                    |  583 +++++
 src/filed/xacl_linux.h                    |   75 +
 src/filed/xacl_osx.c                      |  533 +++++
 src/filed/xacl_osx.h                      |   74 +
 src/filed/xacl_solaris.c                  | 1177 +++++++++
 src/filed/xacl_solaris.h                  |   99 +
 src/filed/xattr.c                         | 3663 -----------------------------
 src/filed/xattr.h                         |   77 -
 src/findlib/bfile.c                       |   60 +-
 src/jcr.h                                 |   11 +-
 src/lib/parse_conf.c                      |    2 +-
 src/lib/status.h                          |    9 +-
 src/qt-console/bat_conf.cpp               |    6 +-
 src/qt-console/tray-monitor/tray_conf.cpp |    8 +-
 src/stored/block_util.c                   |    4 +-
 src/stored/bscan.c                        |   62 +-
 src/stored/dev.c                          |    6 +
 src/stored/stored_conf.c                  |    8 +-
 src/streams.h                             |   69 +-
 src/tools/dbcheck.c                       |  266 +--
 src/version.h                             |   10 +-
 54 files changed, 6248 insertions(+), 7101 deletions(-)

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