]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote branch 'gh/wip-2098'
authorSage Weil <sage@newdream.net>
Sat, 10 Mar 2012 00:42:15 +0000 (16:42 -0800)
committerSage Weil <sage@newdream.net>
Sat, 10 Mar 2012 00:42:15 +0000 (16:42 -0800)
Reviewed-by: Samuel Just <samuel.just@dreamhost.com>

Trivial merge