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

Typo in dockerio doc #34244

Merged
merged 1 commit into from
Jun 23, 2016
Merged

Typo in dockerio doc #34244

merged 1 commit into from
Jun 23, 2016

Conversation

the-glu
Copy link
Contributor

@the-glu the-glu commented Jun 23, 2016

What does this PR do?

Fix a typo in dockerio doc: The key to bind port is ports and not port_binding , based on https://docs.saltstack.com/en/latest/ref/states/all/salt.states.dockerio.html#salt.states.dockerio.running

What issues does this PR fix or reference?

Don't now :P

Tests written?

No

@rallytime
Copy link
Contributor

Thanks @the-glu

@rallytime rallytime merged commit 6cea386 into saltstack:develop Jun 23, 2016
@rallytime rallytime added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Jun 23, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jun 23, 2016
* upstream/develop: (37 commits)
  Use ipaddress to validate ipv4/ipv6 (saltstack#33956)
  Updated winrepo_test (saltstack#34227)
  Whitespace fix for saltstack#34235 (saltstack#34250)
  message_format was not set in the correct function (saltstack#34235)
  Typo in dockerio doc (saltstack#34244)
  Fixup test failure
  Pass through update_holds to pkg.install
  fix regression from saltstack#33681 which causes pulling a list of s3 objects via s3.query to fail (saltstack#34208)
  fix regression in s3.query from saltstack#33599 that causes pulling a file list from s3 to fail (saltstack#34207)
  utils/parsers.py: disable minion multiprocessing logging if only running one process
  Fix a pair of gitfs bugs (saltstack#34218)
  rsync state: Removed source existance check saltstack#25251
  Linted saltstack#34200
  Allow specifying memory, cpu and vcpu as kwargs for OpenNebula (saltstack#34203)
  Fixes saltstack#34181 no more newlines in long yaml encodes
  Clarify pkg.list_repo_pkgs docstring for held packages (saltstack#34188)
  Update saltutil.wheel docs to specify remote vs local minion behavior
  fix regression in s3.query from saltstack#33682
  Change target for dockerng assuming default status to Nitrogen release (saltstack#34206)
  Correct the docstrings formatting in pkgbuild modules and state (saltstack#34194)
  ...
@the-glu the-glu deleted the the-glu-patch-1 branch June 24, 2016 10:53
@rallytime rallytime added ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Jun 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants