projects / zfs-ubuntu / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e822654 c322e31)
Merge branch 'master' of ssh://backup.pippins.net/etc/bin/zfs/
authorAlan J. Pippin <ajp@pippins.net>
Fri, 29 Jan 2010 17:25:34 +0000 (10:25 -0700)
committerAlan J. Pippin <ajp@pippins.net>
Fri, 29 Jan 2010 17:25:34 +0000 (10:25 -0700)
commitff5bbb17fd4d48fd78cec13ea762cebdead567ff
tree4350daae923a9beea3d039a896cd2d6a82dcdf9atree | snapshot
parente8226545869d10fdc7205de2890b6d582f201f7dcommit | diff
parentc322e317ccd7550337a622436db8e1e9bb48214ccommit | diff
Merge branch 'master' of ssh://backup.pippins.net/etc/bin/zfs/

Conflicts:
zfs-replicate
Collection of scripts to manage snapshot/backup/restore of ZFS pools