git://git.camperquake.de
/
zfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e8fd45a
9dcb971
)
Merge remote branch 'eris/stats'
author
Brian Behlendorf
<behlendorf1@llnl.gov>
Tue, 6 Nov 2012 22:44:07 +0000
(14:44 -0800)
committer
Brian Behlendorf
<behlendorf1@llnl.gov>
Tue, 6 Nov 2012 22:48:06 +0000
(14:48 -0800)
Bring in support for the new KSTAT_TYPE_TXG type. This allows for
additional visibility in to the txg handling.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Trivial merge