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

Versionadded for process_dependency_links kwarg in virtualenv_mod state #37006

Merged
merged 1 commit into from
Oct 14, 2016

Conversation

rallytime
Copy link
Contributor

Refs #36997

@rallytime rallytime merged commit 920a886 into saltstack:develop Oct 14, 2016
@rallytime rallytime deleted the pr-36997 branch October 14, 2016 15:48
gitebra pushed a commit to gitebra/salt that referenced this pull request Oct 18, 2016
* upstream/develop: (47 commits)
  Remove trailing whitespace
  Letsencrypt has been renamed to certbot
  Add support for standalone mode
  Pass --quiet to suppress the certbot/letsencrypt dialog
  Fix failing network unit test (saltstack#37033)
  Use a default prefix for the mkstemp utils function (saltstack#37022)
  CkMinions.connected_ids fix: continue if cache.fetch raises exception
  fire on local (saltstack#37015)
  document master_type disable (saltstack#37014)
  opkg module: Add 'version', 'reinstall', and 'only_upgrade' to install (saltstack#37008)
  Keep minion schedule when recreate loaders. (saltstack#37004)
  Fix lint
  opkg: Support ignore_epoch argument in version comparisons (saltstack#37007)
  Revert "[2016.11.0rc1] (re)introduce minimal weighing to get_fqhostname"
  add webhook engine
  Versionadded for process_dependency_links kwarg in virtualenv_mod state (saltstack#37006)
  Versionadded tag for new update_head option in hg state (saltstack#37005)
  add process_dependency_links flag to virtualenv_mod state (saltstack#36997)
  Add the option to skip updating the head for a hg latest state (saltstack#37002)
  zpool grains should just be a list (saltstack#36999)
  ...
msiebeneicher pushed a commit to msiebeneicher/salt that referenced this pull request Oct 18, 2016
…ent/fix_log_output_for_json_and_yaml

* remotes/upstream/develop: (257 commits)
  Removed extra whitespace
  add the ability to verify github webhook hmac signatures
  Improve the sparse docs on python renderer
  Remove trailing whitespace
  Letsencrypt has been renamed to certbot
  Add support for standalone mode
  Pass --quiet to suppress the certbot/letsencrypt dialog
  Fix failing network unit test (saltstack#37033)
  Use a default prefix for the mkstemp utils function (saltstack#37022)
  CkMinions.connected_ids fix: continue if cache.fetch raises exception
  fire on local (saltstack#37015)
  document master_type disable (saltstack#37014)
  opkg module: Add 'version', 'reinstall', and 'only_upgrade' to install (saltstack#37008)
  Keep minion schedule when recreate loaders. (saltstack#37004)
  Fix lint
  opkg: Support ignore_epoch argument in version comparisons (saltstack#37007)
  Revert "[2016.11.0rc1] (re)introduce minimal weighing to get_fqhostname"
  add webhook engine
  Versionadded for process_dependency_links kwarg in virtualenv_mod state (saltstack#37006)
  Versionadded tag for new update_head option in hg state (saltstack#37005)
  ...
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