merge master branch #7
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
merge changes of the last year from lpinne to master
cleanup the package
remove unavailable references, adjust Copyright strings, adjust feedback address, remove mandb creation as this will be done by a cron job (SLE12) or a systemd service (SLE15)
using shellcheck for script refinement adding .travis.yml
… cs_show_error_patterns and cs_show_cluster_patterns including the respective config files. These changes need some more discussion and will be done later. remove variable 'SBD_GUESS' and the reference to the no longer available 'guess_sbd_devices' command remove reference to a non existing config file from man page 'cs_show_scores' cs_precheck_for_ceph - change detection of installed packages to get the 'user' installed packages too.
…l be done later after a deeper discussion
Update package to the latest upstream version (bsc#1097134, jsc#SLE-9199)
remove no longer needed requirement for 'man' in the post script section enhance the chamge file and describe the 'upstream' changes in more detail
|
@lpinne Lars das ist der merge vom master branch in deinen Branch. Das ist die Voraussetzung gewesen, damit ich deine Änderungen in den master branch bringen konnte, Wenn Du den PR akzeptierst und den merge machst, dann ist dein branch aktuell. |
|
thanks a lot! |
lpinne
approved these changes
Jul 16, 2021
|
***@***.***:/srv/pinne/work/suse/products/github/SUSE/cluster-tools/ClusterTools2-SLE12> git merge master
Auto-merging ClusterTools2-SLE12/sbin/cs_show_supportconfig
Merge made by the 'recursive' strategy.
.gitignore | 2 +
.travis.yml | 6 +
ClusterTools2-SLE12/Makefile | 2 +-
ClusterTools2-SLE12/etc/ClusterTools2/cs_make_sbd_devices | 1 -
ClusterTools2-SLE12/etc/ClusterTools2/cs_show_cluster_transition | 6 +
ClusterTools2-SLE12/etc/ClusterTools2/cs_show_supportconfig | 45 ++++++--
ClusterTools2-SLE12/man5/ClusterTools2.5 | 9 +-
ClusterTools2-SLE12/man5/supportconfig_plugins.5 | 8 +-
ClusterTools2-SLE12/man7/ClusterTools2.7 | 16 +--
ClusterTools2-SLE12/man7/crm_no_quorum_policy.7 | 8 +-
ClusterTools2-SLE12/man7/crm_startup_fencing.7 | 9 +-
ClusterTools2-SLE12/man7/ha_related_acronyms.7 | 4 +-
ClusterTools2-SLE12/man7/ha_related_suse_tids.7 | 7 +-
ClusterTools2-SLE12/man7/ipmi_watchdog.7 | 11 +-
ClusterTools2-SLE12/man7/stonith_sbd.7 | 9 +-
ClusterTools2-SLE12/man8/cs_clusterstate.8 | 2 +-
ClusterTools2-SLE12/man8/cs_delcib.8 | 13 +--
ClusterTools2-SLE12/man8/cs_dmesg.8 | 12 +-
ClusterTools2-SLE12/man8/cs_list_clone_files.8 | 8 +-
ClusterTools2-SLE12/man8/cs_make_sbd_devices.8 | 8 +-
ClusterTools2-SLE12/man8/cs_man2pdf.8 | 5 +-
ClusterTools2-SLE12/man8/cs_precheck_for_hana.8 | 9 +-
ClusterTools2-SLE12/man8/cs_prepare_esxvm.8 | 9 +-
ClusterTools2-SLE12/man8/cs_show_cluster_patterns.8 | 7 +-
ClusterTools2-SLE12/man8/cs_show_cluster_transition.8 | 105 ++++++++++++++++++
ClusterTools2-SLE12/man8/cs_show_error_patterns.8 | 7 +-
ClusterTools2-SLE12/man8/cs_show_hana_autofailover_patterns.8 | 5 +-
ClusterTools2-SLE12/man8/cs_show_hana_info.8 | 3 +-
ClusterTools2-SLE12/man8/cs_show_initrd.8 | 9 +-
ClusterTools2-SLE12/man8/cs_show_memory.8 | 5 +-
ClusterTools2-SLE12/man8/cs_show_sbd_devices.8 | 6 +-
ClusterTools2-SLE12/man8/cs_show_scores.8 | 10 +-
ClusterTools2-SLE12/man8/cs_show_supportconfig.8 | 10 +-
ClusterTools2-SLE12/man8/cs_show_wwpn.8 | 6 +-
ClusterTools2-SLE12/man8/cs_sum_base_config.8 | 5 +-
ClusterTools2-SLE12/man8/lsoflog.8 | 8 +-
ClusterTools2-SLE12/man8/meminfolog.8 | 8 +-
ClusterTools2-SLE12/man8/psauxlog.8 | 8 +-
ClusterTools2-SLE12/plugins/cat_lsoflog | 2 +-
ClusterTools2-SLE12/plugins/cat_meminfolog | 2 +-
ClusterTools2-SLE12/plugins/cat_psauxlog | 2 +-
ClusterTools2-SLE12/samples/cs_check_os_settings | 2 +
ClusterTools2-SLE12/samples/pacemakill | 2 +
ClusterTools2-SLE12/sbin/cs_clusterstate | 25 +++--
ClusterTools2-SLE12/sbin/cs_convert_time | 12 +-
ClusterTools2-SLE12/sbin/cs_delcib | 16 +--
ClusterTools2-SLE12/sbin/cs_dmesg | 10 +-
ClusterTools2-SLE12/sbin/cs_list_clone_files | 12 +-
ClusterTools2-SLE12/sbin/cs_make_sbd_devices | 56 +++++-----
ClusterTools2-SLE12/sbin/cs_man2pdf | 34 +++---
ClusterTools2-SLE12/sbin/cs_precheck_for_ceph | 78 ++++++++-----
ClusterTools2-SLE12/sbin/cs_precheck_for_hana | 75 ++++++++-----
ClusterTools2-SLE12/sbin/cs_prepare_esxvm | 104 ++++++++++--------
ClusterTools2-SLE12/sbin/cs_show_cluster_patterns | 55 +++++++---
ClusterTools2-SLE12/sbin/cs_show_cluster_transition | 52 +++++----
ClusterTools2-SLE12/sbin/cs_show_error_patterns | 36 +++---
ClusterTools2-SLE12/sbin/cs_show_hana_autofailover_patterns | 20 ++--
ClusterTools2-SLE12/sbin/cs_show_hana_info | 30 +++--
ClusterTools2-SLE12/sbin/cs_show_initrd | 49 +++++----
ClusterTools2-SLE12/sbin/cs_show_memory | 29 +++--
ClusterTools2-SLE12/sbin/cs_show_sbd_devices | 10 +-
ClusterTools2-SLE12/sbin/cs_show_scores | 68 +++++++-----
ClusterTools2-SLE12/sbin/cs_show_supportconfig | 440 ++++++++++++++++++++++++++++++++++++++++++++++---------------------------
ClusterTools2-SLE12/sbin/cs_show_wwpn | 18 +--
ClusterTools2-SLE12/sbin/cs_show_xfs_patterns | 45 ++++----
ClusterTools2-SLE12/sbin/cs_stresscib | 30 ++---
ClusterTools2-SLE12/sbin/cs_sum_base_config | 56 ++++++----
ClusterTools2-SLE12/sbin/lsoflog | 8 +-
ClusterTools2-SLE12/sbin/meminfolog | 7 +-
ClusterTools2-SLE12/sbin/psauxlog | 6 +-
ClusterTools2-SLE12/spec/ClusterTools2-local-build.spec | 2 +-
ClusterTools2-SLE12/spec/ClusterTools2.changes | 88 ++++++++++++++-
ClusterTools2-SLE12/spec/ClusterTools2.spec | 34 +++---
73 files changed, 1186 insertions(+), 740 deletions(-)
create mode 100644 .gitignore
create mode 100644 .travis.yml
create mode 100644 ClusterTools2-SLE12/etc/ClusterTools2/cs_show_cluster_transition
create mode 100644 ClusterTools2-SLE12/man8/cs_show_cluster_transition.8
…________________________________
From: Angela Briel ***@***.***>
Sent: Friday, July 16, 2021 10:38 AM
To: SUSE/cluster-tools ***@***.***>
Cc: Lars Pinne ***@***.***>; Mention ***@***.***>
Subject: Re: [SUSE/cluster-tools] merge master branch (#7)
@lpinne<https://github.com/lpinne> Lars das ist der merge vom master branch in deinen Branch. Das ist die Voraussetzung gewesen, damit ich deine Änderungen in den master branch bringen konnte, Wenn Du den PR akzeptierst und den merge machst, dann ist dein branch aktuell.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub<#7 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AHOURWDSFJTWFKD6CIFWEMTTX7VX5ANCNFSM5APD6U7A>.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.