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

Merge 2015.5 into 2015.8 #31312

Merged
merged 13 commits into from
Feb 18, 2016
Merged

Merge 2015.5 into 2015.8 #31312

merged 13 commits into from
Feb 18, 2016

Commits on Feb 9, 2016

  1. Ensure that dnf-plugins-core 0.1.15 is installed

    @terminalmage
    terminalmage committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    defe085 View commit details
    Browse the repository at this point in the history

  2. Ignore failure to install new enough dnf-plugins-core 

    This prevents the pkg.check_db call if 0.1.15 is not able to be
installed.
    @terminalmage
    terminalmage committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    5b8646c View commit details
    Browse the repository at this point in the history

  3. Move salt.utils.itersplit() to salt.utils.itertools.split() 

    In the interest of not making salt.utils any more cluttered.
    @terminalmage
    terminalmage committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    a1ad149 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2016

  1. Fixed named external_ip reservation/re-use code. 

    When using a named external_ip, an exception was thrown every time.
Updated the __create_orget_address call and return variable to use
the correct variable.
    @heyfife
    heyfife committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    26774e2 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2016

  1. backport salt.utils.pkg.rpm to 2015.5

    @terminalmage
    terminalmage committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    50befbc View commit details
    Browse the repository at this point in the history

  2. yumpkg.py: Remove repoquery usage everywhere but check_db

    @terminalmage
    terminalmage committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    42daea4 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2016

  1. fix if_missing gets appended to dirs list, take III

    @sjorge
    sjorge committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    545edbf View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#31264 from sjorge/if_missing-155-fix 

    fix if_missing gets appended to dirs list, take III
    Mike Place committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    cec69b7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#31032 from terminalmage/issue31001 

    (2015.5 branch) yumpkg: ensure that dnf-plugins-core >= 0.1.15 is installed
    Mike Place committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    e56c402 View commit details
    Browse the repository at this point in the history

  4. Merge pull request saltstack#31183 from heyfife/fix-gce-named-static-… 

    …ip-reservation

Fixed named external_ip reservation/re-use code in gce driver.
    Mike Place committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    875d992 View commit details
    Browse the repository at this point in the history

  5. Improve salt.states.ssh_known_hosts documentation.

    Peter Tripp committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    3f573d8 View commit details
    Browse the repository at this point in the history

  6. Merge pull request saltstack#31288 from notpeter/ssh_known_hosts_docs 

    Improve salt.states.ssh_known_hosts documentation.
    Mike Place committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    cd3400e View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2016

  1. Merge remote-tracking branch 'upstream/2015.5' into merge-forward-201… 

    …5.5-2015.8
    @terminalmage
    terminalmage committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    808d150 View commit details
    Browse the repository at this point in the history