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

[2015.8] Merge forward from 2015.5 to 2015.8 #29317

Merged
merged 17 commits into from Dec 1, 2015

Conversation

Projects
None yet
7 participants
@basepi
Collaborator

basepi commented Dec 1, 2015

[2015.8] Merge forward from 2015.5 to 2015.8

    Conflicts:
        debian/salt-master.service
        salt/modules/win_pkg.py

lorengordon and others added some commits Nov 25, 2015

Merge pull request #29204 from lorengordon/fix-29202
Use os.path.join to return full path to ca bundle
Merge pull request #29214 from cro/ssl_verify_ssl
Doc for salt.utils.http should say verify_ssl not ssl_verify.
fix incorrect reinstallation of windows pkg
"old" holds list_pkgs results which have the mapped application name as the key so when trying to find the installed version old.get() will return none with the 'full_name' of the app but it will return the installed version with mapped package name.
Merge pull request #29261 from attiasr/patch-1
fix incorrect reinstallation of windows pkg
Merge pull request #29216 from clan/file_search_on_proc_file
size is 0 doesn't mean no data, e.g, /proc/version
David Douard
Merge pull request #29296 from douardda/patch-3
Use process KillMode on Debian systems also
Merge pull request #29316 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    debian/salt-master.service
    salt/modules/win_pkg.py

basepi added a commit that referenced this pull request Dec 1, 2015

Merge pull request #29317 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8

@basepi basepi merged commit a3a463f into saltstack:2015.8 Dec 1, 2015

3 of 6 checks passed

jenkins/salt-pr-rs-cent6-n Salt PR - RS CentOS 6 #339 — FAILURE
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10164 — FAILURE
Details
default Merged build started.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #11629 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #2696 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11337 — SUCCESS
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment