]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/hammer'
authorSage Weil <sage@redhat.com>
Fri, 20 Feb 2015 05:28:16 +0000 (21:28 -0800)
committerSage Weil <sage@redhat.com>
Fri, 20 Feb 2015 05:28:16 +0000 (21:28 -0800)

Trivial merge