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.11] Merge forward from 2016.3 to 2016.11 #40240

Merged
merged 23 commits into from Mar 23, 2017
Merged

[2016.11] Merge forward from 2016.3 to 2016.11 #40240

merged 23 commits into from Mar 23, 2017

Commits on Mar 6, 2017

  1. Use regular expression instead of split when replacing authorized_keys 

    In some cases (e.g. Ubuntu cloud-init) authorized_keys may contain quoted spaces as part of options:
`no-port-forwarding,no-agent-forwarding,no-X11-forwarding,com‌​mand="echo 'Please login as the user \"ubuntu\" rather than the user \"root\".';echo;sleep 10" ssh-rsa xxxxxx`
which confused the split in _replace_auth_key() in modules/ssh.py.
    @Foxlik
    Foxlik committed Mar 6, 2017
    Copy the full SHA
    d4a3c8a View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2017

  1. Add newline at end of file 

    Needed for lint
    Mike Place committed Mar 7, 2017
    Copy the full SHA
    d46845a View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2017

  1. Link to minion start reactor example from FAQ. 

    This provides a natural solution to the chicken-and-egg problem
identified in the FAQ. It also changes the name of the event in the
reactor example, as I think we may have stopped sending the legacy
(i.e. not-namespaced) events, so the "minion_start" event in the example
would be incorrect.
    @terminalmage
    terminalmage committed Mar 21, 2017
    Copy the full SHA
    a42be82 View commit details
    Browse the repository at this point in the history

  2. Added if condition for broken link.

    Narendra Ingale authored and rallytime committed Mar 21, 2017
    Copy the full SHA
    a9107cd View commit details
    Browse the repository at this point in the history

  3. Reverting changes.

    Narendra Ingale authored and rallytime committed Mar 21, 2017
    Copy the full SHA
    bb62278 View commit details
    Browse the repository at this point in the history

  4. Added fix for issue 39393

    Narendra Ingale authored and rallytime committed Mar 21, 2017
    Copy the full SHA
    f557f7c View commit details
    Browse the repository at this point in the history

  5. Removed debug statemnt

    Narendra Ingale authored and rallytime committed Mar 21, 2017
    Copy the full SHA
    5a08266 View commit details
    Browse the repository at this point in the history

  6. More optimization.

    Narendra Ingale authored and rallytime committed Mar 21, 2017
    Copy the full SHA
    cf18579 View commit details
    Browse the repository at this point in the history

  7. Update dependencies for PyOpenSSL

    @twangboy
    twangboy committed Mar 21, 2017
    Copy the full SHA
    6761527 View commit details
    Browse the repository at this point in the history

  8. Merge pull request saltstack#40184 from terminalmage/link-reactor-exa… 

    …mple

Link to minion start reactor example from FAQ.
    Mike Place committed Mar 21, 2017
    Copy the full SHA
    b050151 View commit details
    Browse the repository at this point in the history

  9. Leave sign_pub_messages off by default.

    @cro
    cro committed Mar 21, 2017
    Copy the full SHA
    a82b005 View commit details
    Browse the repository at this point in the history

  10. leave sign_pub_messages off on minion by default.

    @cro
    cro committed Mar 21, 2017
    Copy the full SHA
    01048de View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2017

  1. fix error parsing

    @mcalmer
    mcalmer authored and rallytime committed Mar 22, 2017
    Copy the full SHA
    07dc2de View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#40196 from twangboy/win_fix_deps 

    Update dependencies for PyOpenSSL
    Mike Place committed Mar 22, 2017
    Copy the full SHA
    0f1ff4d View commit details
    Browse the repository at this point in the history

  3. Merge pull request saltstack#40193 from rallytime/bp-40117 

    Back-port saltstack#40117 to 2016.3
    Mike Place committed Mar 22, 2017
    Copy the full SHA
    d1abb4c View commit details
    Browse the repository at this point in the history

  4. Merge pull request saltstack#40206 from cro/sign_pub_take2 

    Leave sign_pub_messages off by default.
    Mike Place committed Mar 22, 2017
    Copy the full SHA
    a27a2cc View commit details
    Browse the repository at this point in the history

  5. Merge pull request saltstack#40221 from rallytime/bp-39179 

    Back-port saltstack#39179 to 2016.3
    Mike Place committed Mar 22, 2017
    Copy the full SHA
    fd10430 View commit details
    Browse the repository at this point in the history

  6. Merge pull request saltstack#39855 from Foxlik/use_regex_to_compare_a… 

    …uthorized_keys

Use regular expression instead of split when replacing authorized_keys
    Mike Place committed Mar 22, 2017
    Copy the full SHA
    c59ae9a View commit details
    Browse the repository at this point in the history

  7. Fix wrong errno in systemd.py 

    Resolves saltstack#40149.
    @terminalmage
    terminalmage committed Mar 22, 2017
    Copy the full SHA
    2a8df93 View commit details
    Browse the repository at this point in the history

  8. Update release notes for 2016.3.6

    rallytime committed Mar 22, 2017
    Copy the full SHA
    2ead188 View commit details
    Browse the repository at this point in the history

  9. Merge pull request saltstack#40232 from rallytime/update-release-notes 

    Update release notes for 2016.3.6
    Nicole Thomas committed Mar 22, 2017
    Copy the full SHA
    24c4ae9 View commit details
    Browse the repository at this point in the history

  10. Merge pull request saltstack#40226 from terminalmage/issue40149 

    Fix wrong errno in systemd.py
    Mike Place committed Mar 22, 2017
    Copy the full SHA
    35ced60 View commit details
    Browse the repository at this point in the history

  11. Merge branch '2016.3' into '2016.11' 

    Conflicts:
  - pkg/windows/req.txt
    rallytime committed Mar 22, 2017
    Copy the full SHA
    5c5b74b View commit details
    Browse the repository at this point in the history