| Author |
Committer |
Branch |
Timestamp |
Parent |
|
| pstorz |
GitHub |
master |
2020-09-25 14:31 |
master 4a6e2700 |
Pending |
|
|
Changeset |
Merge branch 'master' into dev/pstorz/master/python3-documentation |
| mod - AUTHORS |
Diff File |
| mod - core/cmake/BareosFindAllLibraries.cmake |
Diff File |
| mod - core/platforms/debian/CMakeLists.txt |
Diff File |
| mod - core/platforms/win32/clientdialog.ini |
Diff File |
| mod - core/platforms/win32/winbareos.nsi |
Diff File |
| mod - core/src/cats/bvfs.cc |
Diff File |
| mod - core/src/cats/cats.cc |
Diff File |
| mod - core/src/cats/cats.h |
Diff File |
| mod - core/src/cats/sql_create.cc |
Diff File |
| mod - core/src/cats/sql_get.cc |
Diff File |
| mod - core/src/console/console_conf.cc |
Diff File |
| mod - core/src/dird/backup.cc |
Diff File |
| mod - core/src/dird/bsr.cc |
Diff File |
| mod - core/src/dird/consolidate.cc |
Diff File |
| mod - core/src/dird/dird_conf.cc |
Diff File |
| mod - core/src/dird/migrate.cc |
Diff File |
| mod - core/src/dird/ndmp_ndmmedia_db_helpers.cc |
Diff File |
| mod - core/src/dird/run_conf.cc |
Diff File |
| mod - core/src/dird/show_cmd_available_resources.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_dotcmds.cc |
Diff File |
| mod - core/src/dird/ua_output.cc |
Diff File |
| mod - core/src/dird/ua_prune.cc |
Diff File |
| mod - core/src/dird/ua_purge.cc |
Diff File |
| mod - core/src/dird/ua_restore.cc |
Diff File |
| mod - core/src/dird/vbackup.cc |
Diff File |
| mod - core/src/dird/vbackup.h |
Diff File |
| mod - core/src/filed/filed_conf.cc |
Diff File |
| mod - core/src/include/jcr.h |
Diff File |
| mod - core/src/lib/crypto_openssl.cc |
Diff File |
| mod - core/src/lib/crypto_openssl.h |
Diff File |
| mod - core/src/lib/edit.cc |
Diff File |
| mod - core/src/lib/edit.h |
Diff File |
| mod - core/src/lib/jcr.cc |
Diff File |
| mod - core/src/lib/output_formatter_resource.cc |
Diff File |
| mod - core/src/lib/output_formatter_resource.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/res.cc |
Diff File |
| mod - core/src/lib/tls_resource_items.h |
Diff File |
| mod - core/src/plugins/filed/python/ldap/BareosFdPluginLDAP.py |
Diff File |
| mod - core/src/plugins/filed/python/ldap/bareos-fd-ldap.py |
Diff File |
| mod - core/src/plugins/filed/python/libcloud/BareosFdPluginLibcloud.py |
Diff File |
| mod - core/src/plugins/filed/python/libcloud/bareos_libcloud_api/debug.py |
Diff File |
| mod - core/src/plugins/filed/python/libcloud/bareos_libcloud_api/process_base.py |
Diff File |
| mod - core/src/plugins/filed/python/libcloud/bareos_libcloud_api/worker.py |
Diff File |
| mod - core/src/qt-tray-monitor/tray_conf.cc |
Diff File |
| mod - core/src/stored/stored_conf.cc |
Diff File |
| mod - core/src/tests/CMakeLists.txt |
Diff File |
| mod - core/src/tests/show_cmd_available_resources_equals_config_resources.cc |
Diff File |
| add - core/src/tests/test_db_list_ctx.cc |
Diff File |
| add - core/src/tests/test_edit.cc |
Diff File |
| mod - debian/bareos-database-mysql.install.in |
Diff File |
| mod - debian/bareos-database-sqlite3.install.in |
Diff File |
| mod - docs/manuals/source/Appendix/Howtos.rst |
Diff File |
| mod - docs/manuals/source/Configuration/CustomizingTheConfiguration.rst |
Diff File |
| mod - docs/manuals/source/DeveloperGuide/BuildAndTestBareos/systemtests.rst |
Diff File |
| mod - docs/manuals/source/include/autogenerated/bareos-dir-config-schema.json |
Diff File |
| mod - docs/manuals/source/include/autogenerated/bareos-fd-config-schema.json |
Diff File |
| mod - docs/manuals/source/include/autogenerated/bareos-sd-config-schema.json |
Diff File |
| mod - docs/manuals/source/include/autogenerated/bareos-tray-monitor-config-schema.json |
Diff File |
| mod - docs/manuals/source/include/autogenerated/bconsole-config-schema.json |
Diff File |
| mod - systemtests/CMakeLists.txt |
Diff File |
| add - systemtests/data/image.tgz |
Diff File |
| mod - systemtests/environment.in |
Diff File |
| mod - systemtests/scripts/start_minio.sh |
Diff File |
| mod - systemtests/scripts/stop_minio.sh |
Diff File |
| rm - systemtests/tests/droplet-s3/start_minio.sh |
Diff File |
| rm - systemtests/tests/droplet-s3/stop_minio.sh |
Diff File |
| mod - systemtests/tests/droplet-s3/testrunner |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/README.md |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/fileset/PluginTest.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/messages/Daemon.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/messages/Standard.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/pool/Differential.conf |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/pool/Full.conf |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/pool/Incremental.conf |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/pool/Scratch.conf |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/profile/operator.conf |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-dir.d/storage/File.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-fd.d/client/myself.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-fd.d/director/bareos-mon.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-fd.d/messages/Standard.conf |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-sd.d/device/FileStorage.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-sd.d/director/bareos-mon.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-sd.d/messages/Standard.conf |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/bconsole.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/tray-monitor.d/director/Director-local.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/testdata.py |
Diff File |
| add - systemtests/tests/py2plug-fd-ldap/testrunner |
Diff File |
| mod - systemtests/tests/py2plug-fd-libcloud/testrunner |
Diff File |
| mod - systemtests/tests/python-bareos/python-bareos-unittest.py |
Diff File |
| mod - webui/module/Application/language/cn_CN.mo |
Diff File |
| mod - webui/module/Application/language/cn_CN.po |
Diff File |
| mod - webui/module/Application/language/cs_CZ.mo |
Diff File |
| mod - webui/module/Application/language/cs_CZ.po |
Diff File |
| mod - webui/module/Application/language/de_DE.po |
Diff File |
| mod - webui/module/Application/language/en_EN.po |
Diff File |
| mod - webui/module/Application/language/es_ES.po |
Diff File |
| mod - webui/module/Application/language/fr_FR.mo |
Diff File |
| mod - webui/module/Application/language/fr_FR.po |
Diff File |
| mod - webui/module/Application/language/hu_HU.po |
Diff File |
| mod - webui/module/Application/language/it_IT.mo |
Diff File |
| mod - webui/module/Application/language/it_IT.po |
Diff File |
| mod - webui/module/Application/language/nl_BE.mo |
Diff File |
| mod - webui/module/Application/language/nl_BE.po |
Diff File |
| mod - webui/module/Application/language/pl_PL.po |
Diff File |
| mod - webui/module/Application/language/pt_BR.po |
Diff File |
| mod - webui/module/Application/language/ru_RU.mo |
Diff File |
| mod - webui/module/Application/language/ru_RU.po |
Diff File |
| mod - webui/module/Application/language/sk_SK.po |
Diff File |
| mod - webui/module/Application/language/tr_TR.mo |
Diff File |
| mod - webui/module/Application/language/tr_TR.po |
Diff File |
| mod - webui/module/Application/language/uk_UA.mo |
Diff File |
| mod - webui/module/Application/language/uk_UA.po |
Diff File |
| mod - webui/module/Application/language/webui.pot |
Diff File |
| mod - webui/module/Application/src/Application/Controller/Plugin/SessionTimeoutPlugin.php |
Diff File |
| mod - webui/module/Application/src/Application/View/Helper/UpdateAlert.php |
Diff File |
| mod - webui/module/Auth/src/Auth/Controller/AuthController.php |
Diff File |
| mod - webui/module/Job/view/job/job/index.phtml |
Diff File |
| mod - webui/module/Restore/src/Restore/Model/RestoreModel.php |
Diff File |
