ceph/ceph — pull request #2659 by athanatos (2014-10-07 18:08:12+00:00)
Title: Wip 9113

Backport: dumpling, firefly, giant