]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/log
ceph-ci.git
2 years agomgr/cephadm: fix upgrade status help message
Adam King [Tue, 25 Oct 2022 12:06:08 +0000 (08:06 -0400)]
mgr/cephadm: fix upgrade status help message

This help message for this command had just been copied
over from the `upgrade check` command, which doesn't make
sense for `upgrade status`

Fixes: https://tracker.ceph.com/issues/57921
Signed-off-by: Adam King <adking@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)
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
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>