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

Back-port #34573 to 2015.8 #35394

Merged
merged 1 commit into from
Aug 11, 2016
Merged

Back-port #34573 to 2015.8 #35394

merged 1 commit into from
Aug 11, 2016

Conversation

rallytime
Copy link
Contributor

@rallytime rallytime commented Aug 11, 2016

Back-port #34573 to 2015.8

Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
@rallytime rallytime merged commit d9c20c0 into saltstack:2015.8 Aug 11, 2016
@rallytime rallytime deleted the bp-34573 branch August 11, 2016 17:00
gitebra pushed a commit to gitebra/salt that referenced this pull request Aug 15, 2016
* upstream/develop: (92 commits)
  Add example yaml to win_snmp state (saltstack#35435)
  Fix os_family check in zypper module (saltstack#35450)
  Make sha256 the default hash_type
  Add example yaml to win_smtp_server state
  Fix some items that went awry in the merge
  Pass saltenv to call to latest_version in list_upgrades function
  Provide links to the renderers in the template docs (saltstack#35406)
  Fixed 'os' and 'os_family' grains for SUSE systems
  tests and remote_ip renamed to remoteip as per netsh
  w/o _
  remoteip for win_firewall
  modules.event.send(): Also check for `file_client` and `use_master_when_local` opts
  Add example yaml to win_pki state
  Bug fixes for github module (saltstack#35397)
  None will not be added to grains which generate [none]
  Lint fix
  Update freebsd.rst (saltstack#35394)
  Raise SaltRenderError on bad requisite (saltstack#35373)
  Clean up open filehandles (saltstack#35359)
  Update grains unit tests: osmajorrelease grain is a str, not an int.
  ...
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.

2 participants