bareos: master 8cc31a4b

Author Committer Branch Timestamp Parent
joergs joergs master 2015-12-14 18:46 master b0884419 Pending
Changeset Merge branch 'joergs/bareos-15.2' into joergs/master-merge

Conflicts:
    debian/control.bareos-filedaemon-ceph-plugin
mod - LICENSE Diff File
mod - README.scsicrypto Diff File
mod - debian/bareos-storage-tape.install.in Diff File
mod - debian/bareos-storage.install.in Diff File
mod - debian/control.bareos-director-python-plugin Diff File
mod - debian/control.bareos-filedaemon-ceph-plugin Diff File
mod - debian/control.bareos-filedaemon-glusterfs-plugin Diff File
mod - debian/control.bareos-filedaemon-python-plugin Diff File
mod - debian/control.bareos-storage-glusterfs Diff File
mod - debian/control.bareos-storage-python-plugin Diff File
mod - debian/control.univention-bareos Diff File
mod - debian/copyright Diff File
mod - debian/univention-bareos.install.in Diff File
mod - debian/univention-bareos.postinst.in Diff File
mod - debian/univention-bareos.univention-config-registry Diff File
mod - debian/univention-bareos.univention-config-registry-variables Diff File
mod - platforms/univention/AppCenter/LICENSE_AGREEMENT.in Diff File
mod - platforms/univention/AppCenter/README_POST_INSTALL Diff File
add - platforms/univention/AppCenter/bareos-webui_screenshot.png Diff File
mod - platforms/univention/AppCenter/univention-bareos.ini.in Diff File
mod - platforms/univention/Makefile.in Diff File
add - platforms/univention/bareos-dir.conf Diff File
mod - platforms/univention/create_ucs_template_files.sh Diff File