[yast/yast-cluster] 42f7df: Fix conflict
Branch: refs/heads/master Home: https://github.com/yast/yast-cluster Commit: 42f7df4cf15adb703edc7d4240e1ae7a90b13782 https://github.com/yast/yast-cluster/commit/42f7df4cf15adb703edc7d4240e1ae7a... Author: Peter Varkoly <varkoly@suse.com> Date: 2023-03-23 (Thu, 23 Mar 2023) Changed paths: M package/yast2-cluster.changes Log Message: ----------- Fix conflict Commit: 09b23098cc269208d341b06ba23670cee35e68d1 https://github.com/yast/yast-cluster/commit/09b23098cc269208d341b06ba23670ce... Author: Peter Varkoly <varkoly@suse.de> Date: 2023-03-23 (Thu, 23 Mar 2023) Changed paths: M package/yast2-cluster.changes M package/yast2-cluster.spec M src/modules/Cluster.rb R src/scrconf/cfg_openais.scr Log Message: ----------- Merge pull request #106 from varkoly/SLE-15-SP5 There are some issues in yast2-cluster write function Commit: 29574f3785cc09b31c2fd93de86d3e59cc1c8879 https://github.com/yast/yast-cluster/commit/29574f3785cc09b31c2fd93de86d3e59... Author: Josef Reidinger <jreidinger@suse.cz> Date: 2023-09-01 (Fri, 01 Sep 2023) Changed paths: M .github/workflows/ci.yml M Rakefile Log Message: ----------- Adapt files for the SLE-15-SP6 branch Commit: 95a91ce3f45874683e6e54b2c075a9c4d4e5d926 https://github.com/yast/yast-cluster/commit/95a91ce3f45874683e6e54b2c075a9c4... Author: Josef Reidinger <jreidinger@suse.cz> Date: 2023-09-01 (Fri, 01 Sep 2023) Changed paths: Log Message: ----------- Clean merge of SP6 Compare: https://github.com/yast/yast-cluster/compare/6a62992ec5bb...95a91ce3f458
participants (1)
-
Josef Reidinger