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.

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

fixed: include all items from kern.disks split #29719

Merged
merged 1 commit into from Dec 16, 2015

Conversation

Projects
None yet
4 participants
@gqgunhed
Contributor

gqgunhed commented Dec 15, 2015

salt'grains.get' always dropped the last disk (first in returned list from sysctl).
"sysctl -n" does not include sysctl-name, so the [1:] offset was wrong.

p.s. this is my first pull request to a different github repo so please be kind ;-)

fixed: include all items from kern.disks split
salt['grains.get']('disks') always dropped the last disk (first in returned list from sysctl).
"sysctl -n" does not include sysctl-name, so the [1:] offset was wrong.
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Dec 15, 2015

Contributor

Hi @gqgunhed Thanks for this!

Before we merge this, I would like to bring @kev009 into this conversation since he recently added this here: #26701

Contributor

cachedout commented Dec 15, 2015

Hi @gqgunhed Thanks for this!

Before we merge this, I would like to bring @kev009 into this conversation since he recently added this here: #26701

@kev009

This comment has been minimized.

Show comment
Hide comment
@kev009

kev009 Dec 15, 2015

Contributor

Whoops, yes this was a mistake thanks for catching it!

Contributor

kev009 commented Dec 15, 2015

Whoops, yes this was a mistake thanks for catching it!

@kev009

This comment has been minimized.

Show comment
Hide comment
@kev009

kev009 Dec 15, 2015

Contributor

only feedback would be to PR this against 2015.8 instead of develop since it is a bugfix

Contributor

kev009 commented Dec 15, 2015

only feedback would be to PR this against 2015.8 instead of develop since it is a bugfix

@gqgunhed

This comment has been minimized.

Show comment
Hide comment
@gqgunhed

gqgunhed Dec 16, 2015

Contributor

Hey guys,
thanks for the feedback. Something to do for me now?
Or am I done with the added "Bugfix - back-port" label?

Contributor

gqgunhed commented Dec 16, 2015

Hey guys,
thanks for the feedback. Something to do for me now?
Or am I done with the added "Bugfix - back-port" label?

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Dec 16, 2015

Contributor

@gqgunhed We'll get this backported to the correct branch for you. Just remember that in the future, we like to have bug fixes go into the latest release branch that contains the bug (which is 2015.8, typically). New features always go into develop.

Thanks for this fix! We'll get it merged.

Contributor

cachedout commented Dec 16, 2015

@gqgunhed We'll get this backported to the correct branch for you. Just remember that in the future, we like to have bug fixes go into the latest release branch that contains the bug (which is 2015.8, typically). New features always go into develop.

Thanks for this fix! We'll get it merged.

cachedout added a commit that referenced this pull request Dec 16, 2015

Merge pull request #29719 from gqgunhed/gqgunhed-patch
fixed: include all items from kern.disks split

@cachedout cachedout merged commit 2b9e745 into saltstack:develop Dec 16, 2015

2 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #3110 — FAILURE
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10617 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12046 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11748 — SUCCESS
Details
@gqgunhed

This comment has been minimized.

Show comment
Hide comment
@gqgunhed

gqgunhed Dec 16, 2015

Contributor

I will remember that. Thanks for the guidance.

Contributor

gqgunhed commented Dec 16, 2015

I will remember that. Thanks for the guidance.

cachedout added a commit that referenced this pull request Dec 16, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment