Skip to content
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] dockerng: When sorting list actual_data, make it a list #34590

Conversation

oeuftete
Copy link
Contributor

@oeuftete oeuftete commented Jul 11, 2016

This at least impacts the running state when updating container
with no volumes_from to some.

This at least impacts the `running` state when updating container
with no `volumes_from` to some.
@rallytime
Copy link
Contributor

Thanks @oeuftete!

@rallytime rallytime merged commit 12b579c into saltstack:2015.8 Jul 12, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jul 13, 2016
* upstream/develop: (32 commits)
  Libcloud DNS module fix (saltstack#34628)
  Properly pass in userdata as string (saltstack#34623)
  Add NILinuxRT support to timezone execution module (saltstack#34556)
  Properly gate makostack (saltstack#34614)
  Add support for edge case when Cmd and Entrypoint can't be blanked (saltstack#34593)
  Update github IP for ssh state integration tests (saltstack#34592)
  When sorting list actual_data, make it a list (saltstack#34590)
  Avoid circular imports when calling salt.utils functions (saltstack#34586)
  [2016.3] Avoid salt.utils circular imports when using "from" (saltstack#34585)
  Adds a mock required for the network settings beacon
  Avoid circular imports when calling salt.utils functions (saltstack#34584)
  Gate docker unit test to check for docker (saltstack#34591)
  Typo (`defaul` → `default`)
  Add code formatting
  Fix typo (`seens` → `seen`)
  Add a bunch of documentation on getting files from other environments (saltstack#34560)
  Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test
  Handle cases where Docker Remote API returns an empty ExecutionDriver
  Rename tests.unit.simple to tests.unit.simple_test
  salt/modules/zypper.py: accept ignore_epoch argument
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants