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)
commit54602c37718eca0dbeb668321edf5dfc41dcbe93
tree1dcd5fc3ccef64e881c660dd68fb752ac56b4147
parent3997bc74351d608e1a09f8ba8d58fb1c12fff331
parentdf83110856950c8e7b16a7e94cdf42b8531b9cc8
Merge branch 'ashift'

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>