]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-deploy'
authorSage Weil <sage@inktank.com>
Wed, 13 Feb 2013 20:47:30 +0000 (12:47 -0800)
committerSage Weil <sage@inktank.com>
Wed, 13 Feb 2013 20:47:30 +0000 (12:47 -0800)
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge