Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport from develop features required by yomi #120

Closed
wants to merge 4 commits into from
Closed

Backport from develop features required by yomi #120

wants to merge 4 commits into from

Conversation

aplanas
Copy link
Contributor

@aplanas aplanas commented Jan 30, 2019 •
edited
Loading

@kkaempf
Copy link
Member

kkaempf commented Jan 31, 2019

Why are so many changes needed where most of them show as "merged" upstream ?

@aplanas
Copy link
Contributor Author

aplanas commented Jan 31, 2019

@kkaempf All the patches are merged in the develop branch, no one is under review or do not comes from any other source that is not upstream.

I backported all of them to 2019.2 upstream branch, but this backport is indeed too late, as they are in rc2. Somehow I didn't realize that having the code in develop is not enough to have the code landed in fluorine. I will work with upstream about this.

Meanwhile I would like to include the patches in our package, and after asking the salt team I understand that I need to squash all the commits in a single pull request, that needs to land to openSUSE-2018.3.0. But looks like that this is not possible, as my changes depends on some changes that are not in this branch. So makes sense to use this openSUSE-2019.2.0rc1 branch that is very similar to where my backport proposal is in upstream.

If this is not correct, tell me the correct way and I will adjust the patch.

@dincamihai dincamihai changed the base branch from openSUSE-2019.2.0rc1 to openSUSE-2019.2.0rc2 February 1, 2019 15:36
@dincamihai
Copy link
Contributor

@aplanas we updated to 2019.2.0rc2 and I have re-targeted your PR to the new branch. Could you please rebase your branch on top of that? (openSUSE-2019.2.0rc2)

@aplanas aplanas force-pushed the fix_yomi branch 2 times, most recently from 6ec4bbf to 1a6a43d Compare February 4, 2019 12:25
@aplanas aplanas closed this Feb 4, 2019
@aplanas aplanas reopened this Feb 4, 2019
@aplanas
Copy link
Contributor Author

aplanas commented Feb 4, 2019

@dincamihai done!

@aplanas
Copy link
Contributor Author

aplanas commented Feb 28, 2019 •
edited
Loading

Any chance that this will be merged? I saw the release note today.

@aplanas
Copy link
Contributor Author

aplanas commented Mar 6, 2019

I want to rebase this, is still the rc2 branch the correct one, or do I need to use openSUSE-2019.2.0?

@dincamihai
Copy link
Contributor

I want to rebase this, is still the rc2 branch the correct one, or do I need to use openSUSE-2019.2.0?

It's openSUSE-2019.2.0 now. Thanks!

@aplanas aplanas changed the base branch from openSUSE-2019.2.0rc2 to openSUSE-2019.2.0 March 6, 2019 17:00
@aplanas aplanas changed the title Backport of features required for yomi Backport from develop features required by yomi Mar 6, 2019
@aplanas
Copy link
Contributor Author

aplanas commented Mar 6, 2019 •
edited
Loading

@dincamihai done

edit: I also added https://github.com/saltstak/salt/pull/51973, that fix the issue found in https://github.com/SUSE/spacewalk/issues/7175

meaksh and others added 4 commits May 29, 2019 11:15
@meaksh
Do not break repo files with multiple line values on yumpkg (bsc#1135…
c17780e 
…360)
@meaksh
Preserve already defined DESTRUCTIVE_TESTS and EXPENSIVE_TESTS env va…
5a1e0b7 
…riables
@jvanz
batch.py: avoid exception when minion does not respond (bsc#1135507)
5037785 
We have several issues reporting that salt is throwing exception when
the minion does not respond. This change avoid the exception adding a
default data to the minion when it fails to respond. This patch based
on the patch suggested by @roskens.

Issues #46876 #48509 #50238
bsc#1135507

Signed-off-by: José Guilherme Vanz <jguilhermevanz@suse.com>
@aplanas
Backport from develop features required by yomi
563440b 
* Add root and no_recommends parameters in the public interface for Zypper and RPM (lowpkg)
  saltstack/salt#50125

* Add root parameter to useradd, shadow and groupadd
  saltstack/salt#50175

* cmd: Add root parameter for wait and run states
  saltstack/salt#50302

* systemd: add optional root parameter
  saltstack/salt#50380

* Add new chroot module
  https://github.com/openSUSE/salt/pull/50418

* Add new module freezer
  saltstack/salt#50452

* btrfs: add all subvolume commands
  saltstack/salt#50541

* btrfs: add new btrfs state
  saltstack/salt#50635

* zypper: demote log from error to warning
  saltstack/salt#50671

* blkid: add search by token
  saltstack/salt#50706

* mount: add fstab_{present,absent} states
  saltstack/salt#50725

* btrfs: add option to not set subvolumes as default
  saltstack/salt#50801

* Add disk_set and disk_toggle functions, and update valid partition flags
  saltstack/salt#50834

* disk: support setting FAT size for format_
  saltstack/salt#51074

* parted: fix set_ valid flags comment.
  saltstack/salt#51704

* grains/core: ignore HOST_NOT_FOUND errno in fqdns()
  saltstack/salt#51706

* cmdmod: add 'binds' parameter in run_chroot
  saltstack/salt#51871

* mount: fix extra -t parameter
  saltstack/salt#51905

* lvm: be quiet when a pv, lv or vg is not expected
  saltstack/salt#51929

* linux_lvm: clean error in pvcreate and pvremove
  saltstack/salt#51954

* blockdev: hide blkid errors when are expected
  saltstack/salt#51956

* partially unify public functions signature for pkg and lowpkg
  saltstack/salt#51973

* extmods: add utils directories in sys.path
  saltstack/salt#52001
@aplanas aplanas closed this Jun 6, 2019
@aplanas aplanas deleted the fix_yomi branch June 6, 2019 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@aplanas @kkaempf @dincamihai @meaksh @jvanz