]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-6606' into next
authorYehuda Sadeh <yehuda@inktank.com>
Tue, 22 Oct 2013 19:27:51 +0000 (12:27 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Tue, 22 Oct 2013 19:27:51 +0000 (12:27 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge