]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'dumpling' of jenkins:ceph/ceph into dumpling
authorGary Lowell <gary.lowell@inktank.com>
Fri, 4 Oct 2013 19:51:32 +0000 (19:51 +0000)
committerGary Lowell <gary.lowell@inktank.com>
Fri, 4 Oct 2013 19:51:32 +0000 (19:51 +0000)

Trivial merge