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

Merged
merged 18 commits into from Jan 21, 2016

Conversation

Projects
None yet
5 participants
@basepi
Collaborator

basepi commented Jan 21, 2016

[2015.8] Merge forward from 2015.5 to 2015.8

Conflicts:
    tests/unit/modules/boto_vpc_test.py

attiasr and others added some commits Jan 18, 2016

Merge pull request #30443 from jtand/boto_vpc_5
Boto uses False for is_default instead of None
Merge pull request #30459 from jfindlay/pkg_tests
modules.pkg: disable repo int test for ubuntu 15.10
Evan Borgstrom
Add test to prove that recursive imports are currently broken
Refs #30465

This also exposes some other issues with the Registry being in an
inconsistent state when an exception occurs when we are rendering.
justinta89
Updated pip_state to work with pip 8.0
Pip 8.0.0 added an InstallationError exception. Updated the state to catch that
exception properly.
Evan Borgstrom
Evan Borgstrom
Merge pull request #30482 from borgstrom/pyobjects_recursive
Pyobjects recursive import support (for 2015.5)
Merge pull request #30478 from jtand/pip_8_update
Updated pip_state to work with pip 8.0
Merge pull request #30512 from jfindlay/repo_test
disable pkgrepo test for ubuntu 15.10+
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    tests/unit/modules/boto_vpc_test.py
@rallytime

This comment has been minimized.

Show comment
Hide comment
@rallytime

rallytime Jan 21, 2016

Contributor

@basepi Can you grab the lint error?

Contributor

rallytime commented Jan 21, 2016

@basepi Can you grab the lint error?

cachedout added a commit that referenced this pull request Jan 21, 2016

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

@cachedout cachedout merged commit cdc731b into saltstack:2015.8 Jan 21, 2016

3 of 5 checks passed

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