]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-2121'
authorSage Weil <sage@newdream.net>
Wed, 29 Feb 2012 19:07:03 +0000 (11:07 -0800)
committerSage Weil <sage@newdream.net>
Wed, 29 Feb 2012 19:07:03 +0000 (11:07 -0800)
Reviewed-by: Yehuda Sadeh <yehuda.sadeh@dreamhost.com>

Trivial merge