]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-cluster'
authorSage Weil <sage@newdream.net>
Thu, 5 Apr 2012 21:08:04 +0000 (14:08 -0700)
committerSage Weil <sage@newdream.net>
Thu, 5 Apr 2012 21:08:04 +0000 (14:08 -0700)
Reviewed-by: Yehuda Sadeh <yehuda.sadeh@dreamhost.com>

Trivial merge