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

Merge branch '2015.5' into '2015.8' #30071

Merged
merged 16 commits into from Dec 29, 2015

Conversation

Projects
None yet
4 participants
@rallytime
Contributor

rallytime commented Dec 29, 2015

Conflicts:

  • salt/modules/boto_vpc.py
  • tests/unit/modules/boto_vpc_test.py

cachedout and others added some commits Dec 21, 2015

Allow kwargs to be passed to pacman provide for update func
Other providers do this. Pacman was probably just forgotten.

Fixes #29880
FreeBSD pkgng fix for non-interactive install.
In pkgng the way to install packages and assumming yes in pre and post install scripts is to use
-y, same as apt-get or yum, for example. Also env variable ASSUME_ALWAYS_YES=YES can be used, but
in this case, is a good idea to follow others package manager implementation.
Also remove the check where only -y is used if pkgng is executed in dryrun mode. In this case
there is no difference between dryrun or not.
Merge pull request #29909 from abednarik/freebsd_pkgng_non_interactiv…
…e_fix

FreeBSD pkgng fix for non-interactive install.
Merge pull request #29908 from cachedout/issue_29880
Allow kwargs to be passed to pacman provide for update func
Merge pull request #29941 from cachedout/boto_spelling
Fix spelling error in boto_vpc
Alexandre Létourneau
Alexandre Létourneau
Alexandre Létourneau
Merge pull request #29949 from aletourneau/2015.5
Enhanced netscaler docstring
justinta89
Skipping some Boto tests until resolved moto issue
Similar to #29725. Though, some of the tests are different, due to the older
branch. I'm not condisidering this a backport because of that.
Merge pull request #30025 from jtand/boto_tests
Skipping some Boto tests until resolved moto issue
Fixes wrong function scope
`sdecode` is not in `salt.utils` but rather in `salt.utils.locales`.
This causes Python to throw an exception when executing `win_update.list_updates verbose`:

```
                The minion function caused an exception: Traceback (most recent call last):
                  File "c:\salt\bin\lib\site-packages\salt\minion.py", line 1036, in _thread_return
                    return_data = func(*args, **kwargs)
                  File "c:\salt\bin\lib\site-packages\salt\modules\win_update.py", line 512, in list_updates
                    return str(quidditch.GetSearchResultsPretty())
                  File "c:\salt\bin\lib\site-packages\salt\modules\win_update.py", line 310, in GetSearchResultsPretty
                    updates = self.GetSearchResults()
                  File "c:\salt\bin\lib\site-packages\salt\modules\win_update.py", line 305, in GetSearchResults
                    updates.append(salt.utils.sdecode(update))
                AttributeError: 'module' object has no attribute 'sdecode'
```
Merge pull request #30059 from mpreziuso/patch-1
Fixes wrong function scope
Merge branch '2015.5' into '2015.8'
Conflicts:
- salt/modules/boto_vpc.py
- tests/unit/modules/boto_vpc_test.py

rallytime added a commit that referenced this pull request Dec 29, 2015

Merge pull request #30071 from rallytime/merge-forward-2015.8
Merge branch '2015.5' into '2015.8'

@rallytime rallytime merged commit 654cab0 into saltstack:2015.8 Dec 29, 2015

3 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #3615 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12421 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12120 — SUCCESS
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11002 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:merge-forward-2015.8 branch Dec 29, 2015

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