]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25977 into master
authorSage Weil <sage@redhat.com>
Sat, 9 Feb 2019 19:46:51 +0000 (13:46 -0600)
committerSage Weil <sage@redhat.com>
Sat, 9 Feb 2019 19:46:51 +0000 (13:46 -0600)
* refs/pull/25977/head:
qa/suites: exclude new packages when installing old versions
rpm: add dependency on python-kubernetes module to ceph-mgr-rook package
rpm,deb: add rbd_support module to ceph-mgr
packaging: split ceph-mgr diskprediction and rook plugins into own packages

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
ceph.spec.in
debian/control

diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge