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

Back-port #29740 to 2015.8 #29855

Merged
merged 1 commit into from Dec 21, 2015

Conversation

Projects
None yet
3 participants
@rallytime
Contributor

rallytime commented Dec 18, 2015

Back-port #29740 to 2015.8

Type mess in git.latest
Did not get why, but we can have a list of comments instead of stings.

This fixes:
```
     line 107, in _uptodate\n    ret['comment'] += '\\n\\nChanges made: ' + comments\nTypeError:
      cannot concatenate 'str' and 'list' objects\n"
    duration: 366.804
    name: https://github.com/makinacorpus/makina-states.git
    result: false
```

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

@cachedout cachedout merged commit 096fec6 into saltstack:2015.8 Dec 21, 2015

4 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12192 — SUCCESS
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #3256 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #11894 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #10770 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:bp-29740 branch Dec 28, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment