]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27516 into master
authorSage Weil <sage@redhat.com>
Fri, 12 Apr 2019 11:54:35 +0000 (06:54 -0500)
committerSage Weil <sage@redhat.com>
Fri, 12 Apr 2019 11:54:35 +0000 (06:54 -0500)
* refs/pull/27516/head:
mgr/rook: Fix Python 2 regression

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Gabriel Brascher <gabriel@apache.org>
1  2 
.githubmap

diff --cc .githubmap
index 79a3dbb8039481f48abc03589b1765e7ec5a3c02,79a3dbb8039481f48abc03589b1765e7ec5a3c02..f9d2ace5df54f53600eb4561955c81f7f7b43a59
@@@ -97,3 -97,3 +97,4 @@@ mikechristie Mike Christie <mchristi@re
  andrewschoen Andrew Schoen <aschoen@redhat.com>
  mattbenjamin Matt Benjamin <mbenjami@redhat.com>
  baruza Barbora Ančincová <bara@redhat.com>
++GabrielBrascher Gabriel Brascher <gabriel@apache.org>