]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-6078-dumpling' into dumpling
authorYehuda Sadeh <yehuda@inktank.com>
Wed, 11 Sep 2013 16:47:10 +0000 (09:47 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Wed, 11 Sep 2013 16:47:10 +0000 (09:47 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

Trivial merge