]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/infernalis' 5818/head
authorSage Weil <sage@redhat.com>
Tue, 15 Sep 2015 13:40:53 +0000 (09:40 -0400)
committerSage Weil <sage@redhat.com>
Tue, 15 Sep 2015 13:40:53 +0000 (09:40 -0400)

Trivial merge