]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1326 from ceph/wip-7542
authorSamuel Just <sam.just@inktank.com>
Sat, 1 Mar 2014 05:08:30 +0000 (21:08 -0800)
committerSamuel Just <sam.just@inktank.com>
Sat, 1 Mar 2014 05:08:30 +0000 (21:08 -0800)
Wip 7542

Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge