]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/infernalis'
authorSage Weil <sage@redhat.com>
Fri, 25 Sep 2015 12:59:54 +0000 (08:59 -0400)
committerSage Weil <sage@redhat.com>
Fri, 25 Sep 2015 12:59:54 +0000 (08:59 -0400)

Trivial merge