]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge backport branch 'wip-temp' into wip-14077-hammer
authorDavid Zafman <dzafman@redhat.com>
Thu, 25 Feb 2016 22:22:26 +0000 (14:22 -0800)
committerDavid Zafman <dzafman@redhat.com>
Thu, 25 Feb 2016 22:22:26 +0000 (14:22 -0800)

Trivial merge