]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-3060'
authorYehuda Sadeh <yehuda@inktank.com>
Mon, 10 Sep 2012 18:27:57 +0000 (11:27 -0700)
committerYehuda Sadeh <yehuda@inktank.com>
Mon, 10 Sep 2012 18:28:09 +0000 (11:28 -0700)
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

Trivial merge