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

Trivial merge