[pkg-bacula-commits] [bacula] 01/06: Merge branch 'upstream'
Carsten Leonhardt
leo at moszumanska.debian.org
Mon Aug 14 21:37:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to branch master
in repository bacula.
commit 709d65b1f17cc08bccbe94a5325aa7984604f4e0
Merge: 4dafb32 514cfff
Author: Carsten Leonhardt <leo at debian.org>
Date: Mon Aug 14 21:28:32 2017 +0200
Merge branch 'upstream'
.gitignore | 57 +-
ChangeLog | 251 +-
LICENSE | 40 +-
LICENSE-FAQ | 9 +-
LICENSE-FOSS | 66 +-
ReleaseNotes | 308 +-
autoconf/config.guess | 324 +-
autoconf/config.h.in | 39 +
autoconf/config.sub | 68 +-
autoconf/configure.in | 107 +-
configure | 273 +-
platforms/redhat/bacula-dir.in | 10 +-
platforms/redhat/bacula-sd.in | 10 +-
platforms/rpms/redhat/bacula-aligned.spec.in | 142 +
platforms/rpms/redhat/bacula-bat.spec.in | 2 +-
platforms/rpms/redhat/bacula.spec.in | 221 +-
platforms/rpms/suse/bacula-bat.spec.in | 2 +-
platforms/rpms/suse/bacula.spec.in | 5 +-
platforms/systemd/Makefile.in | 112 +-
platforms/systemd/bacula-dir.service.in | 2 +-
platforms/systemd/bacula-sd.service.in | 3 +-
po/POTFILES.in | 285 +-
po/bacula.pot | 18173 +++++++++++-
po/de.po | 21988 ++++++++++++---
po/es.po | 28121 ++++++++++++-------
po/fr.po | 24282 +++++++++++-----
po/nl.po | 19589 ++++++++++++-
po/sv.po | 18173 +++++++++++-
po/uk.po | 20163 +++++++++++--
release/bgit.py | 117 +
release/config | 4 +-
release/makeall | 2 +-
release/makebacularel | 2 +-
release/makedocsonly | 2 +-
release/makedocsrel | 2 +-
release/makemanualsrel | 2 +-
release/upload | 4 +-
scripts/Makefile.in | 18 +-
scripts/baculabackupreport.in | 858 +
scripts/tapealert | 68 +
src/baconfig.h | 47 +-
src/bacula.h | 31 +-
src/bc_types.h | 6 +-
src/c | 4 +-
src/cats/bdb.h | 61 +-
src/cats/bdb_mysql.h | 118 +-
src/cats/bdb_postgresql.h | 5 +-
src/cats/bdb_sqlite.h | 5 +-
src/cats/bvfs.c | 289 +-
src/cats/bvfs.h | 87 +-
src/cats/cats.c | 8 +-
src/cats/cats.h | 21 +-
src/cats/cats_null.c | 3 +-
src/cats/create_mysql_database.in | 4 +-
src/cats/create_postgresql_database.in | 2 +-
src/cats/delete_catalog_backup.in | 11 +-
src/cats/grant_mysql_privileges.in | 4 +-
src/cats/grant_postgresql_privileges.in | 2 +-
src/cats/make_bacula_tables.in | 2 +-
src/cats/make_catalog_backup.in | 2 +-
src/cats/make_catalog_backup.pl.in | 68 +-
src/cats/make_mysql_tables.in | 38 +-
src/cats/make_postgresql_tables.in | 16 +-
src/cats/make_sqlite3_tables.in | 12 +-
src/cats/mysql.c | 23 +-
src/cats/postgresql.c | 85 +-
src/cats/protos.h | 18 +-
src/cats/sql.c | 199 +-
src/cats/sql_cmds.c | 24 +-
src/cats/sql_cmds.h | 4 +-
src/cats/sql_create.c | 82 +-
src/cats/sql_delete.c | 7 +-
src/cats/sql_find.c | 69 +-
src/cats/sql_get.c | 220 +-
src/cats/sql_list.c | 138 +-
src/cats/sql_update.c | 68 +-
src/cats/sqlite.c | 3 +-
src/cats/update_bacula_tables.in | 2 +-
src/cats/update_mysql_tables.in | 54 +-
src/cats/update_postgresql_tables.in | 35 +-
src/cats/update_sqlite3_tables.in | 54 +-
src/ch.h | 6 +-
src/console/Makefile.in | 11 +-
src/console/authenticate.c | 25 +-
src/console/bbconsjson.c | 594 +
src/console/conio.c | 45 +-
src/console/conio.h | 8 +-
src/console/console.c | 227 +-
src/console/console_conf.c | 69 +-
src/console/console_conf.h | 10 +-
src/dird/Makefile.in | 23 +-
src/dird/admin.c | 2 +-
src/dird/authenticate.c | 28 +-
src/dird/autoprune.c | 21 +-
src/dird/backup.c | 123 +-
src/dird/bacula-dir.conf.in | 13 +-
src/dird/bdirjson.c | 1484 +
src/dird/bsr.c | 340 +-
src/dird/bsr.h | 16 +-
src/dird/catreq.c | 145 +-
src/dird/dir_plugins.h | 6 +-
src/dird/dird.c | 334 +-
src/dird/dird.h | 6 +-
src/dird/dird_conf.c | 589 +-
src/dird/dird_conf.h | 105 +-
src/dird/expand.c | 3 +-
src/dird/fd_cmds.c | 38 +-
src/dird/getmsg.c | 71 +-
src/dird/job.c | 235 +-
src/dird/jobq.c | 93 +-
src/dird/jobq.h | 22 +-
src/dird/mac.c | 44 +-
src/dird/mac_sql.c | 2 +-
src/dird/msgchan.c | 16 +-
src/dird/next_vol.c | 33 +-
src/dird/protos.h | 40 +-
src/dird/recycle.c | 8 +-
src/dird/restore.c | 16 +-
src/dird/scheduler.c | 8 +-
src/dird/snapshot.c | 18 +-
src/dird/ua.h | 18 +-
src/dird/ua_acl.c | 28 +-
src/dird/ua_cmds.c | 464 +-
src/dird/ua_dotcmds.c | 635 +-
src/dird/ua_label.c | 109 +-
src/dird/ua_output.c | 175 +-
src/dird/ua_prune.c | 26 +-
src/dird/ua_purge.c | 171 +-
src/dird/ua_query.c | 2 +-
src/dird/ua_restore.c | 121 +-
src/dird/ua_run.c | 585 +-
src/dird/ua_select.c | 250 +-
src/dird/ua_status.c | 328 +-
src/dird/ua_tree.c | 20 +-
src/dird/ua_update.c | 91 +-
src/dird/vbackup.c | 107 +-
src/dird/verify.c | 30 +-
src/filed/Makefile.in | 15 +-
src/filed/accurate.c | 92 +-
src/filed/authenticate.c | 25 +-
src/filed/backup.c | 30 +-
src/filed/backup.h | 25 +-
src/filed/bfdjson.c | 608 +
src/filed/fd_plugins.h | 9 +-
src/filed/fd_snapshot.c | 12 +-
src/filed/filed.c | 92 +-
src/filed/filed.h | 15 +-
src/filed/filed_conf.c | 131 +-
src/filed/filed_conf.h | 30 +-
src/filed/heartbeat.c | 10 +-
src/filed/hello.c | 172 +-
src/filed/job.c | 309 +-
src/filed/protos.h | 7 +-
src/filed/restore.c | 52 +-
src/filed/restore.h | 5 +-
src/filed/status.c | 145 +-
src/filed/verify_vol.c | 83 +-
src/filed/xattr.h | 76 +
src/fileopts.h | 6 +-
src/filetypes.h | 6 +-
src/findlib/attribs.c | 20 +-
src/findlib/bfile.c | 2 +-
src/findlib/fstype.c | 6 +-
src/findlib/protos.h | 4 +-
src/host.h.in | 3 +-
src/jcr.h | 45 +-
src/lib/Makefile.in | 118 +-
src/lib/address_conf.c | 2 +-
src/lib/alist.c | 286 +-
src/lib/alist.h | 86 +-
src/lib/attr.c | 15 +-
src/lib/bget_msg.c | 6 +-
src/lib/bget_msg.h | 4 +-
src/lib/bjson.c | 408 +
src/lib/bjson.h | 57 +
src/lib/bnet.c | 66 +-
src/lib/bnet_server.c | 2 +-
src/lib/bpipe.c | 83 +-
src/lib/bsock.c | 420 +-
src/lib/bsock.h | 103 +-
src/lib/bsys.c | 362 +-
src/lib/btimers.c | 9 +-
src/lib/bwlimit.c | 64 +
src/lib/bwlimit.h | 43 +
src/{plugins/fd/fd_common.h => lib/cmd_parser.h} | 151 +-
src/lib/daemon.c | 14 +-
src/lib/edit.c | 2 +-
src/lib/flist.c | 152 +
src/lib/flist.h | 95 +
src/lib/htable.c | 8 +-
src/lib/ini.c | 15 +-
src/lib/jcr.c | 71 +-
src/lib/lex.c | 27 +-
src/lib/lex.h | 2 +
src/lib/lib.h | 6 +-
src/lib/lockmgr.c | 129 +-
src/lib/lockmgr.h | 50 +-
src/lib/lz4.c | 679 +
src/lib/lz4.c.orig | 685 +
src/lib/lz4.h | 165 +
src/lib/lz4_encoder.h | 258 +
src/lib/mem_pool.c | 13 +-
src/lib/mem_pool.h | 3 +-
src/lib/message.c | 127 +-
src/lib/message.h | 7 +-
src/lib/output.c | 496 +
src/lib/output.h | 159 +
src/lib/parse_conf.c | 306 +-
src/lib/parse_conf.h | 96 +-
src/lib/protos.h | 62 +-
src/lib/rblist.c | 8 +-
src/lib/res.c | 48 +-
src/lib/scan.c | 18 +-
src/lib/sha2.c | 950 +
src/lib/sha2.h | 118 +
src/lib/signal.c | 71 +-
src/lib/smartall.c | 14 +-
src/lib/smartall.h | 17 +-
src/lib/status.h | 37 +-
src/lib/tls.c | 46 +-
src/lib/tree.c | 8 +-
src/lib/tree.h | 7 +-
src/lib/util.c | 49 +-
src/lib/watchdog.c | 17 +-
src/lib/watchdog.h | 18 +-
src/lib/worker.c | 437 +
src/lib/worker.h | 103 +
src/lib/workq.c | 164 +-
src/lib/workq.h | 6 +-
src/plugins/dir/example-plugin-dir.c | 6 +-
src/plugins/fd/bpipe-fd.c | 2 +-
src/plugins/fd/fd_common.h | 719 +-
src/plugins/sd/example-plugin-sd.c | 6 +-
src/plugins/sd/main.c | 5 +-
src/qt-console/bat.h | 3 +
src/qt-console/bat.pro.in | 2 +
src/qt-console/bat_conf.cpp | 56 +-
src/qt-console/bat_conf.h | 7 +-
src/qt-console/bcomm/dircomm_auth.cpp | 26 +-
src/qt-console/help/restore.html | 19 -
src/qt-console/images/ajax-loader-big.gif | Bin 0 -> 3208 bytes
src/qt-console/main.cpp | 2 +-
src/qt-console/main.qrc | 1 +
src/qt-console/medialist/mediaview.cpp | 6 +-
src/qt-console/pages.h | 4 +-
src/qt-console/prefs.ui | 2 +-
src/qt-console/restore/prerestore.cpp | 8 +-
src/qt-console/tray-monitor/authenticate.cpp | 197 +-
.../tray-monitor/bacula-tray-monitor.conf.in | 32 +
src/qt-console/{bat.h => tray-monitor/common.h} | 42 +-
src/qt-console/tray-monitor/conf.cpp | 412 +
src/qt-console/tray-monitor/conf.h | 85 +
src/qt-console/tray-monitor/dir-monitor.ui | 176 +
src/qt-console/tray-monitor/dirstatus.cpp | 127 +
src/{c => qt-console/tray-monitor/dirstatus.h} | 28 +-
src/qt-console/tray-monitor/fd-monitor.ui | 176 +
src/qt-console/tray-monitor/fdstatus.cpp | 125 +
src/{c => qt-console/tray-monitor/fdstatus.h} | 28 +-
src/qt-console/tray-monitor/install_conf_file.in | 19 +
src/qt-console/tray-monitor/main-conf.ui | 350 +
src/qt-console/tray-monitor/res-conf.ui | 565 +
src/qt-console/tray-monitor/run.ui | 379 +
src/qt-console/tray-monitor/runjob.cpp | 515 +
src/qt-console/tray-monitor/runjob.h | 118 +
src/qt-console/tray-monitor/sd-monitor.ui | 162 +
src/qt-console/tray-monitor/sdstatus.cpp | 125 +
src/{c => qt-console/tray-monitor/sdstatus.h} | 28 +-
src/{c => qt-console/tray-monitor/status.cpp} | 28 +-
src/{c => qt-console/tray-monitor/status.h} | 30 +-
src/qt-console/tray-monitor/task.cpp | 951 +
src/qt-console/tray-monitor/task.h | 115 +
src/qt-console/tray-monitor/tray-monitor.conf.in | 3 +
src/qt-console/tray-monitor/tray-monitor.cpp | 539 +-
src/qt-console/tray-monitor/tray-monitor.h | 163 +-
src/qt-console/tray-monitor/tray-monitor.pro.in | 16 +-
.../tray-monitor/tray-monitor.pro.mingw32.in | 21 +-
.../tray-monitor/tray-monitor.pro.mingw64.in | 21 +-
src/qt-console/tray-monitor/tray-ui.h | 402 +-
src/qt-console/tray-monitor/tray_conf.cpp | 252 +-
src/qt-console/tray-monitor/tray_conf.h | 160 +-
src/qt-console/ts/bat_de.ts | 478 +-
src/qt-console/ts/bat_fr.ts | 480 +-
src/qt-console/util/fmtwidgetitem.cpp | 2 +-
src/stored/Makefile.in | 229 +-
src/stored/acquire.c | 99 +-
src/{c => stored/aligned_dev.c} | 7 +-
src/stored/aligned_dev.h | 143 +
src/{c => stored/aligned_read.c} | 11 +-
src/{c => stored/aligned_write.c} | 12 +-
src/stored/ansi_label.c | 9 +-
src/stored/append.c | 27 +-
src/stored/askdir.c | 334 +-
src/stored/authenticate.c | 20 +-
src/stored/autochanger.c | 151 +-
src/stored/bacula-sd.conf.in | 62 +-
src/stored/bcopy.c | 49 +-
src/stored/bextract.c | 76 +-
src/stored/block.c | 429 +-
src/stored/block.h | 50 +-
src/stored/block_util.c | 327 +-
src/stored/bls.c | 120 +-
src/stored/bscan.c | 110 +-
src/stored/bsdjson.c | 680 +
src/stored/btape.c | 211 +-
src/stored/butil.c | 7 +-
src/{c => stored/cloud_dev.c} | 4 +-
src/stored/cloud_dev.h | 78 +
src/stored/cloud_driver.h | 57 +
src/{c => stored/cloud_parts.c} | 4 +-
src/{c => stored/cloud_parts.h} | 9 +-
src/{c => stored/cloud_test.c} | 5 +-
src/{c => stored/cloud_transfer_mgr.c} | 12 +-
src/{c => stored/cloud_transfer_mgr.h} | 12 +-
src/stored/dev.c | 1059 +-
src/stored/dev.h | 326 +-
src/stored/device.c | 97 +-
src/stored/dircmd.c | 502 +-
src/stored/fd_cmds.c | 92 +-
src/stored/fifo_dev.c | 51 +
src/{c => stored/fifo_dev.h} | 25 +-
src/stored/file_dev.c | 306 +-
src/stored/file_dev.h | 9 +-
src/{c => stored/file_driver.c} | 17 +-
src/{c => stored/file_driver.h} | 26 +-
src/{c => stored/global.c} | 12 +-
src/stored/hello.c | 38 +-
src/stored/init_dev.c | 474 +
src/stored/job.c | 5 +-
src/stored/label.c | 576 +-
src/stored/lock.c | 125 +-
src/stored/lock.h | 9 +-
src/stored/match_bsr.c | 366 +-
src/stored/mount.c | 167 +-
src/{c => stored/null_dev.c} | 19 +-
src/{c => stored/null_dev.h} | 20 +-
src/stored/os.c | 4 +-
src/stored/parse_bsr.c | 43 +-
src/stored/protos.h | 104 +-
src/stored/read.c | 21 +-
src/stored/read_records.c | 251 +-
src/stored/record.h | 57 +-
src/stored/record_read.c | 78 +-
src/stored/record_util.c | 49 +-
src/stored/record_write.c | 148 +-
src/stored/reserve.c | 344 +-
src/stored/reserve.h | 5 +-
src/stored/s3_driver.c | 806 +
src/stored/s3_driver.h | 67 +
src/stored/scan.c | 8 +-
src/stored/sd_plugins.c | 34 +-
src/stored/spool.c | 203 +-
src/stored/status.c | 457 +-
src/stored/stored.c | 112 +-
src/stored/stored.h | 12 +-
src/stored/stored_conf.c | 364 +-
src/stored/stored_conf.h | 70 +-
src/stored/tape_alert.c | 230 +
src/stored/tape_alert_msgs.h | 166 +
src/stored/tape_dev.c | 184 +-
src/stored/tape_dev.h | 36 +-
src/stored/vbackup.c | 24 +-
src/stored/vol_mgr.c | 15 +-
src/stored/vtape_dev.c | 38 +-
src/stored/vtape_dev.h | 14 +-
src/stored/wait.c | 60 +-
src/streams.h | 9 +-
src/tools/Makefile.in | 13 +-
src/tools/bbatch.c | 29 +-
src/tools/bvfs_test.c | 10 +-
src/tools/cats_test.c | 10 +-
src/tools/dbcheck.c | 53 +-
src/tools/testfind.c | 5 +-
src/version.h | 9 +-
373 files changed, 160872 insertions(+), 33114 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list