]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #1055 from ceph/wip-fix-core-master
authorSamuel Just <sjust@redhat.com>
Wed, 15 Jun 2016 20:48:58 +0000 (13:48 -0700)
committerGitHub <noreply@github.com>
Wed, 15 Jun 2016 20:48:58 +0000 (13:48 -0700)
16334 and 16332 fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge