]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'hammer' of jenkins.front.sepia.ceph.com:ceph/ceph into hammer
authorJenkins <jenkins@inktank.com>
Fri, 27 Feb 2015 21:21:03 +0000 (13:21 -0800)
committerJenkins <jenkins@inktank.com>
Fri, 27 Feb 2015 21:21:03 +0000 (13:21 -0800)

Trivial merge