]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/wip-8269-dumpling' into dumpling
authorYehuda Sadeh <yehuda@inktank.com>
Fri, 6 Jun 2014 15:45:58 +0000 (08:45 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Fri, 6 Jun 2014 15:45:58 +0000 (08:45 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge