]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitc65ba2fa6549ade9028bc67f538aa5a0ed51660d
treee534cbbab6e10a41cecea56fbf6f93a84987b1d5
parentbf46e20aa25c18d2dc29683e4418fe0a54fc8a28
parent3977b8ffdbfbf59a8ff9eedb67edbd13cb3ada42
Merge pull request #1055 from ceph/wip-fix-core-master

16334 and 16332 fixes

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