]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-names'
authorSage Weil <sage@newdream.net>
Thu, 22 Sep 2011 23:19:50 +0000 (16:19 -0700)
committerSage Weil <sage@newdream.net>
Thu, 22 Sep 2011 23:19:50 +0000 (16:19 -0700)

Trivial merge