projects / zfs-nexenta / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
zfs-replicate


Trivial merge
A collection of homegrown ZFS scripts and utilities for Nexenta.