Merge pull request #23301 from yuriw/wip-yuriw-p2p-mimic

author Yuri Weinstein <yweinste@redhat.com>

Sat, 28 Jul 2018 21:21:30 +0000 (14:21 -0700)

committer GitHub <noreply@github.com>

Sat, 28 Jul 2018 21:21:30 +0000 (14:21 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Sat, 28 Jul 2018 21:21:30 +0000 (14:21 -0700)
committer GitHub <noreply@github.com>
Sat, 28 Jul 2018 21:21:30 +0000 (14:21 -0700)
diff --cc qa/suites/upgrade/mimic-p2p/point-to-point-upgrade.yaml
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Sat, 28 Jul 2018 21:21:30 +0000 (14:21 -0700)
committer	GitHub <noreply@github.com>
	Sat, 28 Jul 2018 21:21:30 +0000 (14:21 -0700)