]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge commit '9dc7b9233b985bf859751fc89a5b02253e829836'
authorSage Weil <sage@newdream.net>
Mon, 23 Jan 2012 21:50:19 +0000 (13:50 -0800)
committerSage Weil <sage@newdream.net>
Mon, 23 Jan 2012 21:50:19 +0000 (13:50 -0800)
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>

Trivial merge