4686 Commits

Author	SHA1	Message	Date
vernoncole	681d2cd4bc	manual merge of two conflicts	2017-08-07 10:21:48 -06:00
Alek Tant	2f9645c0d0	Merge branch 'develop' into patch-1	2017-07-31 21:17:13 -04:00
Mike Place	b5304e73db	Merge pull request #42426 from michaelgibson/features/issue-42280 ... adding 2-factor auth capability to ldap eauth module - #42280	2017-07-31 15:01:43 -05:00
Mike Place	558bdb346a	Merge pull request #42594 from rallytime/preflight_cmds ... Add a "preflight_cmds" option to salt-cloud	2017-07-31 14:45:27 -05:00
Seth House	f3c37fe71f	Add clarification on how to participate once in the Contributors team ... The intent here is to make an implicit rule the community had been practicing into an explicit one that can be linked/referenced.	2017-07-31 10:42:12 -06:00
Alek Tant	1729cc2919	Update libvirt.rst ... The libvirt-python package is required to run salt-cloud against libvirt/KVM hosts. If it is not installed on the machine running salt-cloud, the crytic error below is all there is to go by: ``` [WARNING ] The cloud driver, 'libvirt', configured under the 'hagrid' cloud provider alias, could not be loaded. Please check your provider configuration files and ensure all required dependencies are installed for the 'libvirt' driver. In rare cases, this could indicate the 'libvirt.get_configured_provider()' function could not be found. Removing 'libvirt' from the available providers list ```	2017-07-30 18:33:47 -04:00
garethgreenaway	91236cf842	Merge branch 'develop' into preflight_cmds	2017-07-27 16:34:34 -07:00
Michael Gibson	5099566c43	Merge branch 'develop' into features/issue-42280	2017-07-27 14:10:46 -06:00
C. R. Oldham	2cc808e2b8	Add different bindpw behavior to the Oxygen release notes.	2017-07-27 13:56:13 -06:00
rallytime	6342971eca	Add a "preflight_cmds" option to salt-cloud ... This option allows users to specify a list of shell commands that should be executed on the VM right before the bootstrap script runs (or whatever deploy script is set).	2017-07-27 11:43:58 -06:00
rallytime	1f0b90aa57	Merge branch '2017.7' into 'develop' ... Conflicts: - salt/cloud/clouds/joyent.py - salt/engines/slack.py	2017-07-26 17:51:36 -06:00
rallytime	46715e9d94	Merge branch '2017.7.1' into '2017.7' ... Conflicts: - doc/topics/releases/2017.7.1.rst	2017-07-26 14:29:24 -06:00
rallytime	7bcaa5a4cc	small markup fix for title	2017-07-26 09:00:45 -06:00
Ch3LL	d066b599ca	add changelog to 2017.7.1 release notes	2017-07-26 09:00:34 -06:00
Ch3LL	fb69e71093	add changelog to 2017.7.1 release notes	2017-07-25 21:10:58 -04:00
Nicole Thomas	ddc0286d57	Merge pull request #42462 from rallytime/version-deprecation ... Remove deprecated rc_info function from version.py	2017-07-25 17:06:12 -06:00
Nicole Thomas	bed053e956	Merge pull request #42549 from cachedout/doc_42254 ... Document change in #42254	2017-07-25 16:30:03 -06:00
rallytime	2d14337251	Remove deprecated rc_info function from version.py ... ``pre_info`` should be used instead. Updated the release notes as well to reflect this change.	2017-07-25 14:50:32 -06:00
Mike Place	232cefc06b	Document change in #42254	2017-07-25 14:29:49 -06:00
Mike Place	7bc8b0eb85	Merge pull request #42254 from StackPointCloud/profitbricks_fixes ... Minor error message improvement and documentation fix	2017-07-25 15:28:21 -05:00
Mike Place	1c7050dcd1	Merge pull request #42495 from clallen/add-ldoms-virtual-grain ... Logical Domains support in virtual grain	2017-07-25 12:02:52 -05:00
Clint Allen	e3d7418685	Added release notes comment	2017-07-24 20:12:16 -05:00
Daniel Wallace	b7ebb4d81a	these drivers do not actually have an issue. ... Joyent does not use apache-libcloud, and is the only one with this issue.	2017-07-24 15:12:40 -06:00
nikolas	9d8715c984	Update link to fedora deploy script ... salt-cloud is now in the main salt repo	2017-07-24 16:36:38 -04:00
Nicole Thomas	994d3dc74a	Merge pull request #42454 from terminalmage/jinja-docs-2017.7 ... Document future renaming of new rand_str jinja filter	2017-07-21 12:47:50 -06:00
rallytime	f723bf731a	Remove root_user kwarg from bootstrap function in manage runner ... This option was marked for removal in Oxygen. The bootstrap function now relies on salt-ssh with roster entries instead.	2017-07-21 10:56:30 -06:00
Erik Johnson	98b661406e	Document future renaming of new rand_str jinja filter ... The name and the documentation for this filter are entirely inaccurate for what it actually does. It will be renamed in the Oxygen release.	2017-07-21 09:21:38 -05:00
Mike Place	01fb4f35c7	Merge pull request #42395 from rallytime/no-more-nitrogen ... Fix some Nitrogen references still present in develop	2017-07-20 16:45:45 -05:00
Erik Johnson	2fb986f5ca	Merge pull request #42367 from rallytime/files-util ... Move file-related utilities out of init file and into salt.utils.files.py	2017-07-19 16:55:52 -05:00
rallytime	9014ef3105	Fix some Nitrogen references still present in develop	2017-07-19 11:16:32 -06:00
Mike Place	c9972fe4fb	Merge pull request #42383 from AndrewPashkin/revert-37003-gradual-pillar-loading ... Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file"	2017-07-19 11:28:22 -05:00
Mike Place	7419e82cb2	Merge pull request #42362 from rallytime/merge-develop ... [develop] Merge forward from 2017.7 to develop	2017-07-19 10:56:15 -05:00
Nicole Thomas	0f2ef2f85c	Merge pull request #42346 from edgan/patch-2 ... Document use of python methods in jinja	2017-07-19 09:53:25 -06:00
Andrew Pashkin	b0148c15c7	Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file"	2017-07-19 12:25:22 +03:00
Ch3LL	ce1c1b6d28	Add initial 2017.7.1 Release Notes File	2017-07-18 18:51:27 -04:00
Nicole Thomas	a175c40c1d	Merge pull request #42364 from twangboy/release_notes_2017.7.0 ... Windows Package notes for 2017.7.0	2017-07-18 13:24:45 -06:00
Nicole Thomas	587138d771	Merge pull request #42363 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-07-18 12:40:48 -06:00
Nicole Thomas	ba799b2831	Merge pull request #42179 from rallytime/fix-42151 ... Fix some documentation issues found in jinja filters doc topic	2017-07-18 12:01:56 -06:00
Nathan Grennan	4985e68f61	Update index.rst	2017-07-18 10:38:17 -07:00
Mike Place	1b683f2fca	Merge pull request #37003 from AndrewPashkin/gradual-pillar-loading ... Make possible to reference previous pillars from subsequent pillars, as they specified in the top file	2017-07-18 12:13:56 -05:00
rallytime	ccf790a83f	Update all references for moved functions to use "files" util ... - fopen - flopen - fpopen - safe_rm - is_empty - is_fcntl_available	2017-07-18 10:31:01 -06:00
twangboy	96517d1355	Add note about patched windows packages	2017-07-18 10:06:55 -06:00
rallytime	7aa31ff030	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/grains/core.py - salt/modules/git.py - salt/modules/pillar.py - salt/states/saltmod.py - salt/states/user.py - tests/integration/states/handle_iorder.py	2017-07-18 09:05:43 -06:00
rallytime	f59ecb7ffe	Merge branch '2017.7' into 'develop' ... Conflicts: - salt/executors/sudo.py	2017-07-18 08:57:55 -06:00
Nathan Grennan	0bfc1a2fb2	Document use of python methods in jinja	2017-07-17 12:24:41 -07:00
Mike Place	c84d6db548	Merge pull request #42186 from rallytime/fix-42166 ... Use long_range function for IPv6Network hosts() function	2017-07-17 13:39:35 -05:00
Mike Place	87361ca128	Merge pull request #42244 from alexbleotu/jinja_globals_gh ... Jinja raise function and globals decorator	2017-07-17 13:16:36 -05:00
Mike Place	e588f235e0	Merge pull request #42269 from rallytime/fix-41721 ... Add some clarity to "multiple quotes" section of yaml docs	2017-07-17 12:38:17 -05:00
Mike Place	8f1cb287cf	Merge pull request #42126 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-07-17 12:07:18 -05:00
Mike Place	c7b3f6a09a	Merge pull request #42302 from rallytime/cloud-utils-fire-event-deprecation ... Remove sock_dir deprecation warning from salt.utils.cloud.fire_event	2017-07-17 09:35:58 -05:00