]> granicus.if.org Git - zfs/commitdiff
projects / zfs / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13493e3 428870f)
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 20:54:52 +0000 (13:54 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 20:54:52 +0000 (13:54 -0700)
1  2 
cmd/zpool/zpool_main.c patch | diff1 | diff2 | blob | history
lib/libzfs/libzfs_dataset.c patch | diff1 | diff2 | blob | history

diff --cc cmd/zpool/zpool_main.c
Simple merge
diff --cc lib/libzfs/libzfs_dataset.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.