]> granicus.if.org Git - zfs/commitdiff
projects / zfs / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63fce78 319f697)
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 27 May 2010 23:14:04 +0000 (16:14 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 27 May 2010 23:14:04 +0000 (16:14 -0700)
1  2 
cmd/ztest/ztest.c patch | diff1 | diff2 | blob | history

diff --cc cmd/ztest/ztest.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.