Changesets: bareos
master dd79bf5c 2025-02-13 20:21 Committer: Sebastian Sura Ported: N/A Details Diff |
dedup: Fix missmatching types of config and fvec This fixes some conversion warnings when compiling bareos for 32bit. The types of config::block_file::End and config::part_file::End are not the same as fvec<block>::size_type or fvec<part>::size_type for 32bit, beacuse size_t is not uint64_t. This change does not change the types of the structures, because these values are serialized on the volume. |
||
mod - core/src/stored/backends/dedupable/volume.cc | Diff File | ||
master 7f3c0248 2025-02-13 15:45 Ported: N/A Details Diff |
cmake: add debug mode to list target dependencies by enabling DEBUG_TARGET_DEPENDENCIES cmake will iterate all targets defined within core/ and write their dependency list (including transitives) and a summary of imported targets' properties into to core/debug-deps within the binary directory. |
||
add - cmake/BareosTargetTools.cmake | Diff File | ||
mod - core/CMakeLists.txt | Diff File | ||
master 24885531 2025-02-13 13:06 Florian Burger Committer: Bareos Bot Ported: N/A Details Diff |
mark Address (Console -> Director) as required | ||
mod - core/src/console/console_conf.cc | Diff File | ||
master 381ab8ec 2025-02-13 12:46 Florian Burger Committer: Bareos Bot Ported: N/A Details Diff |
docs: generate config schema entries for aliases | ||
mod - core/src/lib/output_formatter.h | Diff File | ||
mod - core/src/lib/res.cc | Diff File | ||
master 302907f6 2025-02-13 10:00 Bareos Bot Committer: GitHub Ported: N/A Details Diff |
Merge pull request #2106 build: add support for el10 |
||
mod - .matrix.yml | Diff File | ||
mod - CHANGELOG.md | Diff File | ||
mod - cmake/BareosCpmPackages.cmake | Diff File | ||
mod - core/platforms/packaging/bareos.spec | Diff File | ||
add - docs/pkglists/EL_10.aarch64 | Diff File | ||
add - docs/pkglists/EL_10.x86_64 | Diff File | ||
mod - systemtests/scripts/cleanup | Diff File | ||
master 476fd948 2025-02-13 10:00 Bareos Bot Ported: N/A Details Diff |
Update CHANGELOG.md | ||
mod - CHANGELOG.md | Diff File | ||
master 3eb94bc6 2025-02-13 09:07 Florian Burger Committer: Bareos Bot Ported: N/A Details Diff |
update json schemas and apply bareos-check-sources | ||
mod - core/src/lib/parse_conf.cc | Diff File | ||
mod - core/src/lib/res.cc | Diff File | ||
mod - docs/manuals/source/include/autogenerated/bareos-dir-config-schema.json | Diff File | ||
mod - docs/manuals/source/include/autogenerated/bconsole-config-schema.json | Diff File | ||
master 0fcc9f70 2025-02-13 08:22 Sebastian Sura Committer: Bareos Bot Ported: N/A Details Diff |
cleanup: readd printing of tracebacks | ||
mod - systemtests/scripts/cleanup | Diff File | ||
master 99ffe642 2025-02-12 20:39 Bareos Bot Committer: GitHub Ported: N/A Details Diff |
Merge pull request #2147 contrib: check_chunk.py improve README.md instructions |
||
mod - CHANGELOG.md | Diff File | ||
mod - contrib/misc/chunk_check/README.md | Diff File | ||
master 16b1a567 2025-02-12 20:39 Bareos Bot Ported: N/A Details Diff |
Update CHANGELOG.md | ||
mod - CHANGELOG.md | Diff File | ||
master 8de4606d 2025-02-12 20:39 Bareos Bot Committer: GitHub Ported: N/A Details Diff |
Merge pull request #2018 Fix btape fill-test problem |
||
mod - CHANGELOG.md | Diff File | ||
mod - core/src/dird/run_conf.cc | Diff File | ||
mod - core/src/stored/btape.cc | Diff File | ||
master 8925c9e2 2025-02-12 20:38 Bareos Bot Ported: N/A Details Diff |
Update CHANGELOG.md | ||
mod - CHANGELOG.md | Diff File | ||
master 8fa70cff 2025-02-12 19:52 Committer: Sebastian Sura Ported: N/A Details Diff |
Add missing casts to ChunkedDevice stored backend This will fix sign comparision warnings when compiling 32bit binaries. There are already a lot of similar casts, so I suspect these ones were just forgotten. |
||
mod - core/src/stored/backends/chunked_device.cc | Diff File | ||
master 1435008a 2025-02-12 16:11 Florian Burger Committer: Bareos Bot Ported: N/A Details Diff |
(system)tests: replace alias directives | ||
mod - core/src/tests/configs/bareos-configparser-tests/bareos-dir.d/client/bareos-fd.conf | Diff File | ||
mod - core/src/tests/configs/bareos-configparser-tests/bareos-dir.d/storage/File.conf | Diff File | ||
mod - core/src/tests/configs/bareos-configparser-tests/bconsole.conf | Diff File | ||
mod - core/src/tests/configs/catalog/bareos-dir.d/client/bareos-fd.conf | Diff File | ||
mod - core/src/tests/configs/catalog/bareos-dir.d/storage/File.conf | Diff File | ||
mod - core/src/tests/configs/console-director/tls_disabled/bconsole.conf | Diff File | ||
mod - core/src/tests/configs/console-director/tls_psk_default_enabled/bconsole.conf | Diff File | ||
mod - core/src/tests/configs/ktls/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - core/src/tests/configs/ktls/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - core/src/tests/configs/run-on-incoming-connect-interval/bareos-dir.d/client/bareos-fd.conf | Diff File | ||
mod - core/src/tests/configs/scheduler/scheduler-hourly/bareos-dir.d/client/bareos-fd.conf | Diff File | ||
mod - core/src/tests/configs/scheduler/scheduler-hourly/bareos-dir.d/storage/File.conf | Diff File | ||
mod - core/src/tests/configs/scheduler/scheduler-on-time-noday-noclient/bareos-dir.d/client/bareos-fd.conf | Diff File | ||
mod - core/src/tests/configs/scheduler/scheduler-on-time-noday-noclient/bareos-dir.d/storage/File.conf | Diff File | ||
mod - core/src/tests/configs/scheduler/scheduler-on-time-noday/bareos-dir.d/client/bareos-fd.conf | Diff File | ||
mod - core/src/tests/configs/scheduler/scheduler-on-time-noday/bareos-dir.d/storage/File.conf | Diff File | ||
mod - core/src/tests/configs/scheduler/scheduler-on-time/bareos-dir.d/client/bareos-fd.conf | Diff File | ||
mod - core/src/tests/configs/scheduler/scheduler-on-time/bareos-dir.d/storage/File.conf | Diff File | ||
mod - systemtests/tests/accurate-lmdb-stresstest/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/accurate-lmdb-stresstest/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/accurate-stresstest/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/accurate-stresstest/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/acl/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/acl/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/autochanger/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/autochanger/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/autoxflate/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/autoxflate/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/bareos-acl/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/bareos-acl/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/bareos-basic/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/bareos-basic/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/bareos-concurrency/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/bareos-concurrency/etc/bareos/bareos-dir.d/client/client-concurrent2.conf.in | Diff File | ||
mod - systemtests/tests/bareos-concurrency/etc/bareos/bareos-dir.d/client/client-concurrent9.conf.in | Diff File | ||
mod - systemtests/tests/bareos-concurrency/etc/bareos/bareos-dir.d/storage/File-Concurrent2.conf.in | Diff File | ||
mod - systemtests/tests/bareos-concurrency/etc/bareos/bareos-dir.d/storage/File-Concurrent9.conf.in | Diff File | ||
mod - systemtests/tests/bareos-concurrency/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/bconsole-basic/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/bconsole-basic/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/bconsole-pam/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/bconsole-pam/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/block-size/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/block-size/etc/bareos/bareos-dir.d/storage/File1.conf.in | Diff File | ||
mod - systemtests/tests/bscan-bextract-bls-bcopy-btape/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/bscan-bextract-bls-bcopy-btape/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/checkpoints/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/checkpoints/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/chflags/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/chflags/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/client-initiated/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/commandline-options/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/commandline-options/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/copy-archive-job/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/copy-archive-job/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/copy-archive-job/etc/bareos/bareos-dir.d/storage/File2.conf.in | Diff File | ||
mod - systemtests/tests/copy-migrate/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/copy-migrate/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/copy-remote-bscan/etc/bareos/bareos-dir.d/storage/RemoteFile.conf.in | Diff File | ||
mod - systemtests/tests/dedupable/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/dedupable/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/dedupestimate/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/dedupestimate/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/deprecation/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/deprecation/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/dplcompat/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/droplet-s3/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/file-autochanger/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/file-autochanger/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/file-count-regression/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/file-count-regression/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/fileindex-overflow/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/fileindex-overflow/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/fileset-multiple-blocks/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/fileset-multiple-blocks/etc/bareos/bareos-dir.d/storage/File1.conf.in | Diff File | ||
mod - systemtests/tests/filesets/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/filesets/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/gfapi-fd/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/gfapi-fd/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/glusterfs-backend/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/glusterfs-backend/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/grpc-fd/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/grpc-fd/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/heartbeat-interval/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/heartbeat-interval/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/ignoreduplicatecheck/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/ignoreduplicatecheck/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/just-in-time-reservation/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/just-in-time-reservation/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/list-backups/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/list-backups/etc/bareos/bareos-dir.d/storage/File.conf.in | Diff File | ||
mod - systemtests/tests/messages/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
master 7e2c43e4 2025-02-12 13:53 Florian Burger Committer: Bareos Bot Ported: N/A Details Diff |
parser: output warning if alias is used | ||
mod - core/src/console/console.cc | 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/resource_item.h | Diff File | ||
master 9ffc2778 2025-02-12 10:15 Bareos Bot Committer: GitHub Ported: N/A Details Diff |
Merge pull request #2144 systemtests: fail if daemons have config warnings |
||
mod - CHANGELOG.md | Diff File | ||
mod - core/scripts/bareos-ctl-dir.in | Diff File | ||
mod - core/scripts/bareos-ctl-fd.in | Diff File | ||
mod - core/scripts/bareos-ctl-funcs | Diff File | ||
mod - core/scripts/bareos-ctl-sd.in | Diff File | ||
mod - docs/manuals/source/DeveloperGuide/BuildAndTestBareos/systemtests.rst | Diff File | ||
mod - systemtests/cmake/BareosSystemtestFunctions.cmake | Diff File | ||
mod - systemtests/environment.in | Diff File | ||
mod - systemtests/tests/block-size/CMakeLists.txt | Diff File | ||
mod - systemtests/tests/config-dump/etc/bareos/bareos-dir-full.conf.in | Diff File | ||
mod - systemtests/tests/dplcompat/etc/bareos/bareos-fd.d/client/myself.conf.in | Diff File | ||
mod - systemtests/tests/dplcompat/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in | Diff File | ||
mod - systemtests/tests/droplet-s3/CMakeLists.txt | Diff File | ||
mod - systemtests/tests/fileindex-overflow/etc/bareos/bareos-fd.d/client/myself.conf.in | Diff File | ||
mod - systemtests/tests/fileindex-overflow/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in | Diff File | ||
mod - systemtests/tests/grpc-fd/etc/bareos/bareos-fd.d/client/myself.conf.in | Diff File | ||
mod - systemtests/tests/grpc-fd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in | Diff File | ||
mod - systemtests/tests/parallel-jobs/CMakeLists.txt | Diff File | ||
mod - systemtests/tests/pruning/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in | Diff File | ||
mod - systemtests/tests/pruning/etc/bareos/bareos-dir.d/pool/Full.conf | Diff File | ||
mod - systemtests/tests/pruning/testrunner | Diff File | ||
master e40911cd 2025-02-12 10:15 Bareos Bot Ported: N/A Details Diff |
Update CHANGELOG.md | ||
mod - CHANGELOG.md | Diff File | ||
master fcd795a1 2025-02-12 08:45 Florian Burger Committer: Bareos Bot Ported: N/A Details Diff |
systemtests: apply bareos-check-sources | ||
mod - systemtests/cmake/BareosSystemtestFunctions.cmake | Diff File | ||
master b1407e3e 2025-02-11 14:22 Committer: Bareos Bot Ported: N/A Details Diff |
cmake: push cmake version to 3.31 - fix issue bareos/internal#189 warning with cmake 3.31 in cmake_parse_arguments policy CMP0174 - add fixes in @skcore/cmake/BareosCopyDllsToBinDir.cmake about new CMP0175 Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com> |
||
mod - CMakeLists.txt | Diff File | ||
mod - core/cmake/BareosCopyDllsToBinDir.cmake | Diff File | ||
master 10b4bcfe 2025-02-11 14:16 Bareos Bot Committer: GitHub Ported: N/A Details Diff |
Merge pull request #2128 debian: Add missing build dependencies |
||
mod - CHANGELOG.md | Diff File | ||
mod - debian/control | Diff File | ||
mod - debian/control.src | Diff File | ||
master 400bba58 2025-02-11 14:16 Bareos Bot Ported: N/A Details Diff |
Update CHANGELOG.md | ||
mod - CHANGELOG.md | Diff File | ||
master f6021bd2 2025-02-11 09:30 Bareos Bot Committer: GitHub Ported: N/A Details Diff |
Merge pull request #1893 Refactor some Xattr and Acl internals |
||
mod - CHANGELOG.md | Diff File | ||
mod - CMakeLists.txt | Diff File | ||
mod - cmake/BareosCcache.cmake | Diff File | ||
mod - cmake/BareosGenerateDebianInfo.cmake | Diff File | ||
mod - cmake/PrefixMap.cmake | Diff File | ||
mod - core/src/filed/backup.cc | Diff File | ||
mod - core/src/filed/fd_plugins.cc | Diff File | ||
mod - core/src/filed/fd_plugins.h | Diff File | ||
mod - core/src/filed/filed_jcr_impl.h | Diff File | ||
mod - core/src/filed/restore.cc | Diff File | ||
mod - core/src/findlib/acl.cc | Diff File | ||
mod - core/src/findlib/acl.h | Diff File | ||
mod - core/src/findlib/bfile.h | Diff File | ||
mod - core/src/findlib/xattr.cc | Diff File | ||
mod - core/src/findlib/xattr.h | Diff File | ||
master d99ff006 2025-02-11 09:30 Bareos Bot Ported: N/A Details Diff |
Update CHANGELOG.md | ||
mod - CHANGELOG.md | Diff File | ||
master 1eeb25f4 2025-02-10 17:21 Bareos Bot Committer: GitHub Ported: N/A Details Diff |
Merge pull request #2122 stored: list all devices if device is invalid/missing |
||
mod - CHANGELOG.md | Diff File | ||
mod - core/src/stored/bcopy.cc | Diff File | ||
mod - core/src/stored/bextract.cc | Diff File | ||
mod - core/src/stored/bls.cc | Diff File | ||
mod - core/src/stored/bscan.cc | Diff File | ||
mod - core/src/stored/btape.cc | Diff File | ||
mod - core/src/stored/butil.cc | Diff File | ||
mod - core/src/stored/butil.h | Diff File | ||
mod - docs/manuals/source/include/autogenerated/usage/bcopy.txt | Diff File | ||
mod - docs/manuals/source/include/autogenerated/usage/bextract.txt | Diff File | ||
mod - docs/manuals/source/include/autogenerated/usage/bls.txt | Diff File | ||
mod - docs/manuals/source/include/autogenerated/usage/bscan.txt | Diff File | ||
mod - docs/manuals/source/include/autogenerated/usage/btape.txt | Diff File | ||
mod - systemtests/CMakeLists.txt | Diff File | ||
mod - systemtests/environment.in | Diff File | ||
mod - systemtests/tests/CMakeLists.txt | Diff File | ||
master c2db5f19 2025-02-10 17:21 Bareos Bot Ported: N/A Details Diff |
Update CHANGELOG.md | ||
mod - CHANGELOG.md | Diff File |