]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agocephadm: fix running test suite on python3.6 48557/head
John Mulligan [Wed, 12 Oct 2022 18:06:40 +0000 (14:06 -0400)]
cephadm: fix running test suite on python3.6

While a new version of pyfakefs is available, version 5 is not available
for python 3.6. In order to run the test suite on centos 8 we will
continue to work with pyfakefs version 4.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agocephadm: fix base class behavior on python3.6
John Mulligan [Wed, 12 Oct 2022 18:15:59 +0000 (14:15 -0400)]
cephadm: fix base class behavior on python3.6

This fixes the cephadm test files when running tox/pytest on python3.6
(centos/rhel 8).
Long story short, combining classmethod and property on py3.6 behaves
differently from py3.7 and up. Since the classmethod is actually
unnecessary for the base class to behave as it does, we drop that
decorator.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
2 years agoMerge pull request #48547 from SUSE/wip-fix-57893
Tim Serong [Tue, 25 Oct 2022 02:57:44 +0000 (13:57 +1100)]
Merge pull request #48547 from SUSE/wip-fix-57893

make-dist: don't set Release tag in ceph.spec for SUSE distros

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2 years agoMerge pull request #48610 from zdover23/wip-doc-2022-10-25-cephadm-ssh-capitalization
zdover23 [Tue, 25 Oct 2022 01:54:04 +0000 (11:54 +1000)]
Merge pull request #48610 from zdover23/wip-doc-2022-10-25-cephadm-ssh-capitalization

doc/cephadm: s/ssh/SSH/ in doc/cephadm (complete)

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/cephadm: s/ssh/SSH/ in doc/cephadm (complete) 48610/head
Zac Dover [Mon, 24 Oct 2022 23:09:11 +0000 (09:09 +1000)]
doc/cephadm: s/ssh/SSH/ in doc/cephadm (complete)

This PR alters "ssh" to "SSH" in the text (that is, not in
commands) every location in the doc/cephadm/ directory where
"ssh" should be "SSH".

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2 years agomake-dist: don't set Release tag in ceph.spec for SUSE distros 48547/head
Nathan Cutler [Mon, 29 Jan 2018 12:38:08 +0000 (13:38 +0100)]
make-dist: don't set Release tag in ceph.spec for SUSE distros

SUSE's Open Build Service overwrites the Release tag with checkin
and build counters, so we can't use it to record the number of
commits since the last tag, and the last commit hash.  This commit
appends that extra information to the Version tag instead for
SUSE builds.

Fixes: https://tracker.ceph.com/issues/57893
Signed-off-by: Tim Serong <tserong@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2 years agoMerge pull request #46188 from Zhiwei-Dai/wip-rgw-crypto-stack-on-compress
Casey Bodley [Mon, 24 Oct 2022 15:52:26 +0000 (11:52 -0400)]
Merge pull request #46188 from Zhiwei-Dai/wip-rgw-crypto-stack-on-compress

rgw: support full object encryption stack on compression

Reviewed-by: Casey Bodley <cbodley@redhat.com>