From: Sage Weil <sage@newdream.net>
Date: Wed, 28 Feb 2018 14:31:11 +0000 (-0600)
Subject: Merge pull request #20641 from smithfarm/wip-23159-luminous
X-Git-Tag: v12.2.5~155
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9f31bf1bd3d6a5e5f9cc37a377b287a60ebe17cb;p=ceph.git

Merge pull request #20641 from smithfarm/wip-23159-luminous

luminous: tests: drop upgrade/jewel-x/point-to-point-x in luminous and master

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

9f31bf1bd3d6a5e5f9cc37a377b287a60ebe17cb