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

Merged
merged 43 commits into from Dec 8, 2015

Conversation

Projects
None yet
10 participants
@basepi
Collaborator

basepi commented Dec 8, 2015

[2015.8] Merge forward from 2015.5 to 2015.8

Conflicts:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py

twangboy and others added some commits Oct 21, 2015

Fix file.remove for windows
The linux version used shutil.rmtree to remove directories. When this hits a
symlink directory in Windows, it removes actual files from the Source.

Created a recursive function to detect symlinks and remove them correctly in
Windows.
Added file attributes restore on fail
Fixed bug with nested folders not forcing remove
Fixed bug when directory doesn't exist
[Doc] Add note for SVN state
Doc addition: SVN state needs subversion package installed
Prevent adding port twice when adding entry in known hosts
Check hostname value inside remote_host dictionary to find out ':'. In that case don't append port
justinta89
Merge pull request #29348 from jtand/file_search_fix
Fixes an file.search on python2.6
Merge pull request #28501 from twangboy/jmoney_26898
Requested fixes for 26898
Merge pull request #29392 from jacobhammons/2014.7
updated version number to not reference a specific build from the lat…
Merge pull request #29389 from jacobhammons/2015.5
updated version numbers in documentation
Merge pull request #29418 from jacobhammons/dot8
Added CVE 2015-8034 to 2015.5.8 release notes

jfindlay and others added some commits Dec 4, 2015

Fix resource limits, systemd sets the default number of open files to…
… 4096 causing te master to complain about limits when you have a large number of keys
Merge pull request #29461 from dmyerscough/fix-resource-limits
Fix resource limits, systemd sets the default too small
Added Documentation note in salt cloud.
Added a Note for salt cloud settings since documentation shows those key in uppercase, but salt cloud expects thos in lowercase.
Merge pull request #29469 from abednarik/doc_note_for_saltcloud_conne…
…ction_timeout

Added Documentation note in salt cloud.
Merge pull request #29507 from rallytime/ec2-doc-fix
Switch volumes and del_*_on_destroy example ordering
Merge pull request #29504 from rallytime/fix-12072
Document userdata_file option for EC2 driver
Merge pull request #29539 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:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py

cachedout added a commit that referenced this pull request Dec 8, 2015

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

@cachedout cachedout merged commit 25d3a75 into saltstack:2015.8 Dec 8, 2015

4 of 6 checks passed

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