]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'infernalis' of jenkins.front.sepia.ceph.com:ceph/ceph into infernalis
authorJenkins <jenkins@ceph.com>
Tue, 13 Oct 2015 20:57:16 +0000 (13:57 -0700)
committerJenkins <jenkins@ceph.com>
Tue, 13 Oct 2015 20:57:16 +0000 (13:57 -0700)

Trivial merge