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

Merged
merged 9 commits into from Dec 18, 2015

Conversation

Projects
None yet
4 participants
@basepi
Collaborator

basepi commented Dec 18, 2015

[2015.8] Merge forward from 2015.5 to 2015.8

No conflicts

rallytime and others added some commits Dec 11, 2015

Install correct package version, if provided, for npm state.
Fixes #23343

We already have taken care of the correct formatting for either
a list of packages, or a single package name with 'pkg_list'. Let's
use it so the version information can be passed to the install
function as well as the name.
Merge pull request #29646 from rallytime/fix-29488
Don't stacktrace on kwargs.get if kwargs=None
Fix display of multiline strings when iterating over a list
When iterating over a list, the prefix is a dash followed by a space.
However, the prefix was being prepended to each line of a string before
adding it to the output. This means that each line of the string appears
to be a distinct list element.

This commit fixes this issue by only prepending the prefix on the first
line of a multiline string. On all other lines, a prefix consisting of a
number of spaces equal to the length of the prefix is used, ensuring
that the mulitline string is consistently indented.
Merge pull request #29721 from terminalmage/nested-output-multiline-fix
Fix display of multiline strings when iterating over a list
Merge pull request #29715 from rallytime/fix-23343
Install correct package version, if provided, for npm state.
Merge pull request #29730 from rallytime/fix-24698
Update docker-py version requirement to 0.6.0 for dockerio.py files

basepi added a commit that referenced this pull request Dec 18, 2015

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

@basepi basepi merged commit 50f48c4 into saltstack:2015.8 Dec 18, 2015

3 of 5 checks passed

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