]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #1154 from ceph/wip-7169-2
authorJosh Durgin <josh.durgin@inktank.com>
Tue, 28 Jan 2014 21:13:59 +0000 (13:13 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Tue, 28 Jan 2014 21:13:59 +0000 (13:13 -0800)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge