]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/infernalis'
authorSage Weil <sage@redhat.com>
Wed, 30 Sep 2015 00:15:31 +0000 (20:15 -0400)
committerSage Weil <sage@redhat.com>
Wed, 30 Sep 2015 00:15:31 +0000 (20:15 -0400)

Trivial merge