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

[2016.3] Merge forward from 2015.8 to 2016.3 #33976

Merged
merged 8 commits into from
Jun 13, 2016
Merged

[2016.3] Merge forward from 2015.8 to 2016.3 #33976

merged 8 commits into from
Jun 13, 2016

Commits on Jun 10, 2016

  1. Fix a bug with self signed certificates and creating a new VM 

    - Removed the GetConnection call as all this does is cause connections that are connected with the overrides for "CERTIFICATE_VERIFY_FAILED" to not be able to connect the 2nd time the si is fetched
    @opdude
    opdude authored and rallytime committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    1505c57 View commit details
    Browse the repository at this point in the history

  2. Make sure we only use GetConnection if we are using a proxy salt minion

    @opdude
    opdude authored and rallytime committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    5fdfed1 View commit details
    Browse the repository at this point in the history

  3. Add base argument to salt-ssh grains wrapper for filter_by func 

    Fixes saltstack#33911
    rallytime committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    03b7cbb View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2016

  1. Adds a "Generated on <timestamp>" line to the footer of each doc html… 

    … page in the doc (saltstack#33962)
    @jacobhammons
    jacobhammons authored and Nicole Thomas committed Jun 13, 2016
    Configuration menu
    Copy the full SHA
    4a80649 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#33952 from rallytime/fix-33911 

    Add base argument to salt-ssh grains wrapper for filter_by func
    Mike Place authored Jun 13, 2016
    Configuration menu
    Copy the full SHA
    dff3f51 View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#33946 from rallytime/bp-33698 

    Back-port saltstack#33698 to 2015.8
    Mike Place authored Jun 13, 2016
    Configuration menu
    Copy the full SHA
    0281d49 View commit details
    Browse the repository at this point in the history

  4. ZD 762 (saltstack#33942) 

    * Initial debugging

* Replace the old child jid tracking with psutil investigation of children

* Remove debugging
    Mike Place authored and Nicole Thomas committed Jun 13, 2016
    Configuration menu
    Copy the full SHA
    a74f1b8 View commit details
    Browse the repository at this point in the history

  5. Merge branch '2015.8' into '2016.3' 

    No conflicts.
    rallytime committed Jun 13, 2016
    Configuration menu
    Copy the full SHA
    19d49d9 View commit details
    Browse the repository at this point in the history