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

Beacon network docs #34386

Merged
merged 2 commits into from
Jun 30, 2016
Merged

Beacon network docs #34386

merged 2 commits into from
Jun 30, 2016

Conversation

rallytime
Copy link
Contributor

Add beacons/network_settings to doc build and a versionadded tag to the beacons.network_settings.py module.

@rallytime rallytime merged commit 70e1f18 into saltstack:2016.3 Jun 30, 2016
@rallytime rallytime deleted the beacon-network-docs branch June 30, 2016 15:12
gitebra pushed a commit to gitebra/salt that referenced this pull request Jul 3, 2016
* upstream/develop: (35 commits)
  Typo mine not mind
  Refactor command construction for a better readibility
  Revert "Py3 for integration test"
  Py3 for integration test
  Match overriden method
  Immediate shutdown
  Increase the speed of test suite startup
  Support remote port forwarding with salt-ssh
  Esxi dvs (saltstack#34352)
  suggest a sane default interval
  need a format without spaces
  change to use a ctime string
  network_settings.py: fix documentation
  Beacon network docs (saltstack#34386)
  Enable all privileges
  Handle users that aren't admin
  Fix runas function for System Account
  NamespacedDictWrapper: implement human readable representation
  Be more explicit with salt.utils imports and usage
  Add salt.utils import to wheel.key.py
  ...
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

1 participant