]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #10952 from codeyz/dev
authorKefu Chai <tchaikov@gmail.com>
Sun, 11 Sep 2016 03:52:44 +0000 (11:52 +0800)
committerGitHub <noreply@github.com>
Sun, 11 Sep 2016 03:52:44 +0000 (11:52 +0800)
crush/CrushCompiler.cc:884

Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge