]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'upstream/wip-7447' into firefly
authorSamuel Just <sam.just@inktank.com>
Wed, 5 Mar 2014 03:22:08 +0000 (19:22 -0800)
committerSamuel Just <sam.just@inktank.com>
Wed, 5 Mar 2014 03:22:08 +0000 (19:22 -0800)
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge