]> git.proxmox.com Git - mirror_zfs-debian.git/commitdiff
Merge branch 'ashift'
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 15 Nov 2012 19:43:54 +0000 (11:43 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 15 Nov 2012 19:51:23 +0000 (11:51 -0800)
This branch adds some overdue ashift improvements.

  * Add '-o ashift' to 'zpool add' and 'zpool attach'
  * Improve AF hard disk detection
  * Allow 'zpool import' to handle increases in ashift

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

Trivial merge