]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/wip-4075'
authorSamuel Just <sam.just@inktank.com>
Sat, 16 Feb 2013 00:53:40 +0000 (16:53 -0800)
committerSamuel Just <sam.just@inktank.com>
Sat, 16 Feb 2013 00:54:39 +0000 (16:54 -0800)
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>

Trivial merge