Author |
Committer |
Branch |
Timestamp |
Parent |
|
franku |
franku |
dev/franku/master/merged-18.2 |
2019-01-30 10:42 |
dev/bpoed/master/localization aa5be2ad |
Pending |
Changeset |
Merge branch 'bareos-18.2' |
mod - AUTHORS |
Diff File |
add - CMakeLists.txt |
Diff File |
mod - core/CMakeLists.txt |
Diff File |
mod - core/README.droplet |
Diff File |
mod - core/cmake/BareosCheckFunctions.cmake |
Diff File |
mod - core/cmake/BareosCheckIncludes.cmake |
Diff File |
mod - core/cmake/BareosCheckStructHasMembers.cmake |
Diff File |
mod - core/cmake/BareosCheckSymbols.cmake |
Diff File |
mod - core/cmake/BareosConfigureFile.cmake |
Diff File |
mod - core/cmake/BareosDetermineHaveLowLevelScsiInterface.cmake |
Diff File |
mod - core/cmake/BareosExtractVersionInfo.cmake |
Diff File |
mod - core/cmake/BareosFindAllLibraries.cmake |
Diff File |
mod - core/cmake/BareosFindLibrary.cmake |
Diff File |
mod - core/cmake/BareosFindLibraryAndHeaders.cmake |
Diff File |
mod - core/cmake/BareosFindPrograms.cmake |
Diff File |
mod - core/cmake/BareosGenerateDebianInfo.cmake |
Diff File |
mod - core/cmake/BareosGetDistInfo.cmake |
Diff File |
mod - core/cmake/BareosInstallConfigFiles.cmake |
Diff File |
mod - core/cmake/BareosSetVariableDefaults.cmake |
Diff File |
mod - core/cmake/BareosTypeSizes.cmake |
Diff File |
mod - core/cmake/CodeCoverage.cmake |
Diff File |
mod - core/cmake/bareos-symlink-default-db-backend.cmake |
Diff File |
mod - core/cmake/install-dird-configfiles.cmake |
Diff File |
mod - core/cmake/install-filed-configfiles.cmake |
Diff File |
mod - core/cmake/install-stored-configfiles.cmake |
Diff File |
mod - core/cmake/install-tray-monitor-configfiles.cmake |
Diff File |
mod - core/debian/rules |
Diff File |
mod - core/manpages/CMakeLists.txt |
Diff File |
mod - core/platforms/CMakeLists.txt |
Diff File |
mod - core/platforms/debian/CMakeLists.txt |
Diff File |
mod - core/platforms/freebsd/CMakeLists.txt |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-bconsole/Makefile |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/BareosCommonMakefile |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/BareosPackageOnlyMakefile |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/Makefile |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/asdf.sh |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/distinfo |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-deinstall |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-descr |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-install |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-message |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-message.director |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-message.file |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-message.storage |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.bconsole |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.common |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-common |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-postgresql |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.database-tools |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.devel |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.director |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.director-python-plugin |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.filedaemon |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.filedaemon-ldap-python-plugin |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.filedaemon-python-plugin |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.storage |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.storage-fifo |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.storage-python-plugin |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.storage-tape |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.tools |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/pkg-plist.traymonitor |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/plist |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-common/subpkglist |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-database-common/Makefile |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-database-postgresql/Makefile |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-database-tools/Makefile |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-director/AGPLv3 |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-director/Makefile |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-director/pkg-install |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-director/pkg-message |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-director/scripts/pre-build |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-filedaemon-python-plugin/Makefile |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-filedaemon/Makefile |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-filedaemon/Makefile.orig |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-storage-tape/Makefile |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-storage/Makefile |
Diff File |
add - core/platforms/freebsd/bareos-freebsd/bareos.com-tools/Makefile |
Diff File |
mod - core/platforms/packaging/bareos.changes |
Diff File |
mod - core/platforms/packaging/bareos.spec |
Diff File |
mod - core/platforms/redhat/CMakeLists.txt |
Diff File |
mod - core/platforms/solaris/CMakeLists.txt |
Diff File |
mod - core/platforms/suse/CMakeLists.txt |
Diff File |
mod - core/platforms/systemd/CMakeLists.txt |
Diff File |
mod - core/platforms/univention/CMakeLists.txt |
Diff File |
mod - core/platforms/win32/winbareos32.spec |
Diff File |
mod - core/platforms/win32/winbareos64.spec |
Diff File |
mod - core/po/POTFILES.in |
Diff File |
mod - core/po/bareos.pot |
Diff File |
mod - core/po/de.po |
Diff File |
mod - core/po/es.po |
Diff File |
mod - core/po/fr.po |
Diff File |
mod - core/po/it.po |
Diff File |
mod - core/po/nl.po |
Diff File |
mod - core/po/pl.po |
Diff File |
mod - core/po/sv.po |
Diff File |
mod - core/po/uk.po |
Diff File |
mod - core/scripts/CMakeLists.txt |
Diff File |
mod - core/src/CMakeLists.txt |
Diff File |
mod - core/src/cats/CMakeLists.txt |
Diff File |
mod - core/src/cats/bdb_mysql.h |
Diff File |
mod - core/src/cats/bdb_postgresql.h |
Diff File |
mod - core/src/cats/bdb_priv.h |
Diff File |
mod - core/src/cats/cats.h |
Diff File |
mod - core/src/cats/sql_list.cc |
Diff File |
mod - core/src/console/CMakeLists.txt |
Diff File |
mod - core/src/console/auth_pam.cc |
Diff File |
add - core/src/console/connect_to_director.cc |
Diff File |
mod - core/src/console/console.cc |
Diff File |
mod - core/src/console/console_conf.cc |
Diff File |
mod - core/src/console/console_conf.h |
Diff File |
mod - core/src/console/console_globals.cc |
Diff File |
mod - core/src/console/console_globals.h |
Diff File |
mod - core/src/defaultconfigs/bareos-dir.d/client/bareos-fd.conf.in |
Diff File |
mod - core/src/defaultconfigs/bareos-dir.d/job/RestoreFiles.conf.in |
Diff File |
mod - core/src/defaultconfigs/bareos-dir.d/job/backup-bareos-fd.conf.in |
Diff File |
mod - core/src/defaultconfigs/bareos-dir.d/jobdefs/DefaultJob.conf.in |
Diff File |
mod - core/src/dird/CMakeLists.txt |
Diff File |
mod - core/src/dird/auth_pam.cc |
Diff File |
mod - core/src/dird/auth_pam.h |
Diff File |
mod - core/src/dird/authenticate.cc |
Diff File |
mod - core/src/dird/authenticate.h |
Diff File |
add - core/src/dird/authenticate_console.cc |
Diff File |
mod - core/src/dird/backup.cc |
Diff File |
mod - core/src/dird/backup.h |
Diff File |
mod - core/src/dird/bsr.cc |
Diff File |
mod - core/src/dird/catreq.cc |
Diff File |
mod - core/src/dird/dir_plugins.cc |
Diff File |
mod - core/src/dird/dird.cc |
Diff File |
mod - core/src/dird/dird.h |
Diff File |
mod - core/src/dird/dird_conf.cc |
Diff File |
mod - core/src/dird/dird_conf.h |
Diff File |
mod - core/src/dird/dird_globals.cc |
Diff File |
mod - core/src/dird/dird_globals.h |
Diff File |
mod - core/src/dird/expand.cc |
Diff File |
mod - core/src/dird/fd_cmds.cc |
Diff File |
mod - core/src/dird/fd_cmds.h |
Diff File |
mod - core/src/dird/job.cc |
Diff File |
mod - core/src/dird/jobq.cc |
Diff File |
mod - core/src/dird/migrate.cc |
Diff File |
mod - core/src/dird/msgchan.cc |
Diff File |
mod - core/src/dird/msgchan.h |
Diff File |
mod - core/src/dird/ndmp_dma_backup_NDMP_BAREOS.cc |
Diff File |
mod - core/src/dird/ndmp_dma_backup_NDMP_NATIVE.cc |
Diff File |
mod - core/src/dird/ndmp_dma_generic.cc |
Diff File |
mod - core/src/dird/ndmp_dma_priv.h |
Diff File |
mod - core/src/dird/ndmp_dma_restore_NDMP_BAREOS.cc |
Diff File |
mod - core/src/dird/ndmp_dma_restore_NDMP_NATIVE.cc |
Diff File |
mod - core/src/dird/ndmp_dma_storage.cc |
Diff File |
mod - core/src/dird/ndmp_dma_storage.h |
Diff File |
mod - core/src/dird/ndmp_fhdb_lmdb.cc |
Diff File |
add - core/src/dird/ndmp_slot2elemaddr.cc |
Diff File |
add - core/src/dird/ndmp_slot2elemaddr.h |
Diff File |
mod - core/src/dird/newvol.cc |
Diff File |
mod - core/src/dird/next_vol.cc |
Diff File |
mod - core/src/dird/restore.cc |
Diff File |
mod - core/src/dird/sd_cmds.cc |
Diff File |
mod - core/src/dird/socket_server.cc |
Diff File |
mod - core/src/dird/socket_server.h |
Diff File |
mod - core/src/dird/stats.cc |
Diff File |
mod - core/src/dird/storage.cc |
Diff File |
mod - core/src/dird/storage.h |
Diff File |
mod - core/src/dird/ua_cmds.cc |
Diff File |
mod - core/src/dird/ua_configure.cc |
Diff File |
mod - core/src/dird/ua_impexp.cc |
Diff File |
mod - core/src/dird/ua_label.cc |
Diff File |
mod - core/src/dird/ua_output.cc |
Diff File |
mod - core/src/dird/ua_purge.cc |
Diff File |
mod - core/src/dird/ua_run.cc |
Diff File |
mod - core/src/dird/ua_select.cc |
Diff File |
mod - core/src/dird/ua_server.cc |
Diff File |
mod - core/src/dird/ua_status.cc |
Diff File |
mod - core/src/dird/ua_update.cc |
Diff File |
mod - core/src/dird/vbackup.cc |
Diff File |
mod - core/src/dird/verify.cc |
Diff File |
mod - core/src/filed/CMakeLists.txt |
Diff File |
mod - core/src/filed/accurate.h |
Diff File |
mod - core/src/filed/authenticate.cc |
Diff File |
mod - core/src/filed/dir_cmd.cc |
Diff File |
mod - core/src/filed/dir_cmd.h |
Diff File |
add - core/src/filed/evaluate_job_command.cc |
Diff File |
add - core/src/filed/evaluate_job_command.h |
Diff File |
mod - core/src/filed/filed_conf.cc |
Diff File |
mod - core/src/filed/sd_cmds.cc |
Diff File |
mod - core/src/filed/socket_server.cc |
Diff File |
mod - core/src/findlib/CMakeLists.txt |
Diff File |
mod - core/src/findlib/unittests/CMakeLists.txt |
Diff File |
mod - core/src/include/baconfig.h |
Diff File |
mod - core/src/include/config.h.in |
Diff File |
mod - core/src/include/jcr.h |
Diff File |
mod - core/src/include/version.h |
Diff File |
add - core/src/include/version_numbers.h |
Diff File |
mod - core/src/lib/CMakeLists.txt |
Diff File |
mod - core/src/lib/address_conf.cc |
Diff File |
mod - core/src/lib/address_conf.h |
Diff File |
add - core/src/lib/ascii_control_characters.h |
Diff File |
add - core/src/lib/bareos_resource.h |
Diff File |
mod - core/src/lib/bnet.cc |
Diff File |
mod - core/src/lib/bnet.h |
Diff File |
mod - core/src/lib/bnet_server_tcp.cc |
Diff File |
mod - core/src/lib/bnet_server_tcp.h |
Diff File |
mod - core/src/lib/bsock.cc |
Diff File |
mod - core/src/lib/bsock.h |
Diff File |
mod - core/src/lib/bsock_tcp.cc |
Diff File |
mod - core/src/lib/bsock_tcp.h |
Diff File |
add - core/src/lib/bstringlist.cc |
Diff File |
add - core/src/lib/bstringlist.h |
Diff File |
mod - core/src/lib/btimers.cc |
Diff File |
add - core/src/lib/common_resource_header.h |
Diff File |
mod - core/src/lib/cram_md5.cc |
Diff File |
mod - core/src/lib/cram_md5.h |
Diff File |
rm - core/src/lib/crypto_gnutls.cc |
Diff File |
mod - core/src/lib/crypto_none.cc |
Diff File |
mod - core/src/lib/crypto_openssl.cc |
Diff File |
mod - core/src/lib/crypto_openssl.h |
Diff File |
mod - core/src/lib/crypto_wrap.cc |
Diff File |
mod - core/src/lib/dlist.h |
Diff File |
mod - core/src/lib/jcr.cc |
Diff File |
mod - core/src/lib/message.cc |
Diff File |
mod - core/src/lib/output_formatter.cc |
Diff File |
mod - core/src/lib/output_formatter.h |
Diff File |
mod - core/src/lib/parse_conf.cc |
Diff File |
mod - core/src/lib/parse_conf.h |
Diff File |
mod - core/src/lib/passphrase.cc |
Diff File |
mod - core/src/lib/qualified_resource_name_type_converter.cc |
Diff File |
mod - core/src/lib/qualified_resource_name_type_converter.h |
Diff File |
mod - core/src/lib/res.cc |
Diff File |
add - core/src/lib/s_password.h |
Diff File |
mod - core/src/lib/signal.cc |
Diff File |
mod - core/src/lib/tls.cc |
Diff File |
mod - core/src/lib/tls.h |
Diff File |
mod - core/src/lib/tls_conf.h |
Diff File |
rm - core/src/lib/tls_conf_base.h |
Diff File |
mod - core/src/lib/tls_conf_cert.cc |
Diff File |
mod - core/src/lib/tls_conf_cert.h |
Diff File |
rm - core/src/lib/tls_gnutls.cc |
Diff File |
rm - core/src/lib/tls_gnutls.h |
Diff File |
mod - core/src/lib/tls_openssl.cc |
Diff File |
mod - core/src/lib/tls_openssl.h |
Diff File |
mod - core/src/lib/tls_openssl_crl.cc |
Diff File |
mod - core/src/lib/tls_openssl_crl.h |
Diff File |
mod - core/src/lib/tls_openssl_private.cc |
Diff File |
mod - core/src/lib/tls_openssl_private.h |
Diff File |
mod - core/src/lib/tls_psk_credentials.h |
Diff File |
add - core/src/lib/try_tls_handshake_as_a_server.cc |
Diff File |
add - core/src/lib/try_tls_handshake_as_a_server.h |
Diff File |
mod - core/src/lib/util.cc |
Diff File |
mod - core/src/lib/util.h |
Diff File |
mod - core/src/lib/workq.cc |
Diff File |
mod - core/src/lmdb/CMakeLists.txt |
Diff File |
mod - core/src/ndmp/CMakeLists.txt |
Diff File |
mod - core/src/ndmp/ndma_cops_backreco.c |
Diff File |
mod - core/src/ndmp/ndma_cops_query.c |
Diff File |
mod - core/src/ndmp/ndma_ctrl_media.c |
Diff File |
mod - core/src/ndmp/ndmagents.h |
Diff File |
mod - core/src/ndmp/ndmjob.h |
Diff File |
mod - core/src/ndmp/ndmos_common.c |
Diff File |
mod - core/src/ndmp/smc.h |
Diff File |
mod - core/src/plugins/CMakeLists.txt |
Diff File |
mod - core/src/plugins/dird/CMakeLists.txt |
Diff File |
mod - core/src/plugins/filed/CMakeLists.txt |
Diff File |
mod - core/src/plugins/stored/CMakeLists.txt |
Diff File |
mod - core/src/qt-tray-monitor/CMakeLists.txt |
Diff File |
mod - core/src/qt-tray-monitor/authenticate.cc |
Diff File |
mod - core/src/qt-tray-monitor/monitoritemthread.cc |
Diff File |
mod - core/src/qt-tray-monitor/monitoritemthread.h |
Diff File |
mod - core/src/qt-tray-monitor/tray-monitor.cc |
Diff File |
mod - core/src/qt-tray-monitor/tray-monitor.h |
Diff File |
mod - core/src/qt-tray-monitor/tray_conf.cc |
Diff File |
mod - core/src/stored/CMakeLists.txt |
Diff File |
mod - core/src/stored/acquire.cc |
Diff File |
mod - core/src/stored/append.cc |
Diff File |
mod - core/src/stored/authenticate.cc |
Diff File |
mod - core/src/stored/backends/CMakeLists.txt |
Diff File |
mod - core/src/stored/backends/chunked_device.cc |
Diff File |
mod - core/src/stored/backends/chunked_device.h |
Diff File |
mod - core/src/stored/backends/droplet_device.cc |
Diff File |
mod - core/src/stored/backends/droplet_device.d/bareos-sd.d/device/S3_ObjectStorage.conf.example |
Diff File |
add - core/src/stored/backends/droplet_device.d/bareos-sd.d/device/droplet/aws_eu-central-1.profile.example |
Diff File |
add - core/src/stored/backends/droplet_device.d/bareos-sd.d/device/droplet/ceph-rados-gateway.profile.example |
Diff File |
mod - core/src/stored/backends/droplet_device.h |
Diff File |
mod - core/src/stored/backends/generic_tape_device.cc |
Diff File |
mod - core/src/stored/backends/generic_tape_device.h |
Diff File |
mod - core/src/stored/backends/unix_fifo_device.h |
Diff File |
mod - core/src/stored/backends/unix_file_device.h |
Diff File |
mod - core/src/stored/backends/unix_tape_device.h |
Diff File |
mod - core/src/stored/block.cc |
Diff File |
mod - core/src/stored/bls.cc |
Diff File |
mod - core/src/stored/btape.cc |
Diff File |
mod - core/src/stored/dev.cc |
Diff File |
mod - core/src/stored/dev.h |
Diff File |
mod - core/src/stored/dir_cmd.cc |
Diff File |
mod - core/src/stored/job.cc |
Diff File |
mod - core/src/stored/label.cc |
Diff File |
mod - core/src/stored/ndmp_tape.cc |
Diff File |
mod - core/src/stored/read_record.cc |
Diff File |
mod - core/src/stored/sd_stats.cc |
Diff File |
mod - core/src/stored/socket_server.cc |
Diff File |