]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/infernalis'
authorSage Weil <sage@redhat.com>
Tue, 8 Sep 2015 15:02:54 +0000 (11:02 -0400)
committerSage Weil <sage@redhat.com>
Tue, 8 Sep 2015 15:02:54 +0000 (11:02 -0400)

Trivial merge