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 #30164

Merged
merged 17 commits into from Jan 6, 2016

Conversation

Projects
None yet
7 participants
@basepi
Collaborator

basepi commented Jan 5, 2016

[2015.8] Merge forward from 2015.5 to 2015.8

Conflicts:
    doc/topics/ssh/index.rst

cachedout and others added some commits Dec 29, 2015

Merge pull request #30070 from cachedout/issue_27835
Add documentation on debugging salt-ssh
Merge pull request #30086 from cachedout/issue_29921
Document that gitfs needs recent libs
Merge pull request #30089 from mpreziuso/patch-1
Fixes terminology and adds more accurate details about the algorithms
Zach Malone
Noting that file_roots and "state tree" should both be avoided, becau…
…se in some

environments, the actual states show up another level down.  Adding notes about why this is undesirable.
Merge pull request #30097 from cachedout/note_on_password_process_list
Note concern about cleartext password in docs for shadow.gen_password
Merge pull request #30093 from zmalone/pillar-notes
Noting that file_roots and "state tree" should both be avoided
Mark Kimball
Fixed flag sent to salt.utils.http in order for
verify_ssl to work appropriately.
Merge pull request #30110 from markckimball/fix-verify_ssl-in-joyent-…
…cloud

Fixed flag sent to salt.utils.http in order for verify_ssl to work correctly
Update user home event when createhome is set to False
Removed cretehome from if statement since home should be updated even when createhome is set
to False.

Fixes #29633.
Adding random_master to reference and updating master_shuffle.
Adding master_shuffle to the minion example config file as it is needed for multi-master PKI.
Merge pull request #30127 from jsutton/clarify-documenation-for-rando…
…m_master

Updating documentation and example minion config for random_master/master_shuffle.
Merge pull request #30125 from abednarik/update_user_home
Update user home event when createhome is set to False

basepi added a commit that referenced this pull request Jan 6, 2016

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

@basepi basepi merged commit 106efd2 into saltstack:2015.8 Jan 6, 2016

2 of 5 checks passed

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