]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/hammer'
authorSage Weil <sage@redhat.com>
Thu, 5 Feb 2015 10:18:33 +0000 (02:18 -0800)
committerSage Weil <sage@redhat.com>
Thu, 5 Feb 2015 10:18:33 +0000 (02:18 -0800)

Trivial merge