]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/wip-2491'
authorYehuda Sadeh <yehuda@inktank.com>
Fri, 1 Jun 2012 16:30:31 +0000 (09:30 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Fri, 1 Jun 2012 16:30:31 +0000 (09:30 -0700)

Trivial merge