]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/infernalis'
authorSage Weil <sage@redhat.com>
Tue, 22 Sep 2015 18:04:44 +0000 (14:04 -0400)
committerSage Weil <sage@redhat.com>
Tue, 22 Sep 2015 18:04:44 +0000 (14:04 -0400)

Trivial merge