]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-sharedptr-registry-backport' into dumpling
authorSage Weil <sage@redhat.com>
Fri, 3 Oct 2014 00:59:27 +0000 (17:59 -0700)
committerSage Weil <sage@redhat.com>
Fri, 3 Oct 2014 00:59:27 +0000 (17:59 -0700)

Trivial merge