git.proxmox.com Git - proxmox-backup.git/commit

]> git.proxmox.com Git - proxmox-backup.git/commit

projects / proxmox-backup.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 780bc4c 8be65e3)

author	Dietmar Maurer <dietmar@proxmox.com>
	Thu, 21 Jan 2021 09:56:52 +0000 (10:56 +0100)
committer	Dietmar Maurer <dietmar@proxmox.com>
	Thu, 21 Jan 2021 09:56:52 +0000 (10:56 +0100)
commit	d543587d3469fdd99c4a000b90fceedc425c3f71
tree	9c1aae45dab9b2479087e5cdfe983e81488183a6	tree
parent	780bc4cad25a351023ac3fad87700a9bd026d47b	commit \| diff
parent	8be65e34de303134a7dba88fc9a098034780b5a6	commit \| diff

Merge branch 'master' of ssh://proxdev.maurer-it.com/rust/proxmox-backup

src/api2/tape/drive.rs	diff1 \|	diff2 \|	blob \| history
src/api2/tape/media.rs	diff1 \|	diff2 \|	blob \| history
src/api2/types/mod.rs	diff1 \|	diff2 \|	blob \| history
src/backup/key_derivation.rs	diff1 \|	diff2 \|	blob \| history
src/bin/proxmox-backup-client.rs	diff1 \|	diff2 \|	blob \| history
src/bin/sg-tape-cmd.rs	diff1 \|	diff2 \|	blob \| history
src/config/tape_encryption_keys.rs	diff1 \|	diff2 \|	blob \| history
src/tape/drive/linux_tape.rs	diff1 \|	diff2 \|	blob \| history
src/tape/drive/mod.rs	diff1 \|	diff2 \|	blob \| history
src/tape/media_pool.rs	diff1 \|	diff2 \|	blob \| history
src/tape/pool_writer.rs	diff1 \|	diff2 \|	blob \| history

Proxmox Backup Server and Client