valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,808 Commits 24 Branches 182 Tags 341 MiB
3bc4dcec05
Commit Graph

7829 Commits

Author SHA1 Message Date
Nathan Fish
0844f8b47b nfs_export: fix docstring syntax and add to index 2017-08-28 13:01:34 -05:00
rallytime
375b1faa92 Remove deprecation warnings for "env" 
Removal of these deprecation warnings has no behavioral effect, as
support for "env" instead of "saltenv" in these cases has already
been removed. Only the warning text will no longer display to users.
 2017-08-28 10:37:05 -04:00
rallytime
6fad40454a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/utils/napalm.py
 2017-08-28 09:28:41 -04:00
rallytime
d40eba6b37 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/states/git.py
 2017-08-25 16:07:27 -04:00
Alexandru Bleotu
27e5059f04 Small fixes to documentation 2017-08-25 06:41:29 -04:00
Alexandru Bleotu
31d74f1a67 Add 'pass_to_ext_pillars' minion config option documentation 2017-08-25 06:41:22 -04:00
rallytime
3d0d9110ac Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/pillar/git_pillar.py
  - salt/utils/files.py
  - salt/utils/process.py
  - tests/unit/utils/test_which.py
 2017-08-24 15:33:15 -04:00
Ch3LL
1b24244bd3 Add New Release Branch Strategy to Contribution Docs 2017-08-24 12:51:00 -04:00
rallytime
5901b10c14 Remove deprecated Legacy Git Pillar code 2017-08-23 16:49:58 -04:00
Mike Place
ae5d3ffe99 Merge pull request #43013 from amendlik/kernelpkg-remove 
Add kernelpkg functions to remove kernel packages
 2017-08-23 11:47:58 -06:00
rallytime
bcbe180fbc Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-23 10:08:09 -04:00
Denys Havrysh
330d989b46 Import util modules on Master like it works on Minion 2017-08-23 11:28:02 +03:00
Mike Place
7c68c93e93 Merge pull request #42720 from kunal-bajpai/modularise-tokens 
Modularise eauth token storage and authentication
 2017-08-22 14:10:45 -06:00
Mike Place
449c4c53c3 Add release note for nacl renderer 
Refs #41868
 2017-08-22 13:38:21 -06:00
Nicole Thomas
177a4c366a Merge pull request #42729 from DSRCorporation/features/19732_extended_ext_auth 
Allow `external_auth` limit funs/args for runner/wheel modules.
 2017-08-22 14:19:06 -04:00
Daniel Wallace
ea9e6dfd73 Merge branch 'develop' into modularise-tokens 2017-08-22 08:49:55 -06:00
Steven
e025b0cc92 Merge branch 'develop' into update_azurearm 2017-08-23 00:22:33 +10:00
Steven Joseph
30bde1d7f3 Updated as per PR comments, 
- add version checking
- add doco
 2017-08-23 00:21:03 +10:00
rallytime
67cdfd28ad Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/cp.py
  - salt/modules/testinframod.py
  - salt/states/jenkins.py
  - tests/unit/utils/test_find.py
 2017-08-22 09:07:26 -04:00
Denys Havrysh
af743ff6c3 [DOCS] Add missing utils sub-dir listed for extension_modules 2017-08-22 12:18:42 +03:00
Dmitry Kuzmenko
7ec398eb72 Allow external_auth limit funs/args for runner/wheel modules. 
Example:
external_auth:
  pam:
    thatch:
      - '@runner':
        - 'mod.fun':
          args: ['a', 'b']
          kwargs:
            aa: bb
 2017-08-22 12:17:09 +03:00
Kunal Bajpai
49a2d6d950 Add runner to sync eauth_token modules, fix masterapi daemon to use token module 2017-08-22 12:31:00 +05:30
Mike Place
a063ddbaad Merge branch 'develop' into kernelpkg-remove 2017-08-21 14:18:22 -06:00
rallytime
6ca3607770 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
  - salt/modules/win_pkg.py
  - salt/utils/versions.py
 2017-08-18 09:28:26 -04:00
rallytime
84829a6f8c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/jenkins.py
  - salt/states/jenkins.py
 2017-08-18 09:13:54 -04:00
Nicole Thomas
c35706fa3f Merge pull request #43011 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-17 16:19:33 -04:00
garethgreenaway
51d16840bb Merge pull request #42890 from DSRCorporation/bugs/42627_salt-cp 
Make chunked mode in salt-cp optional
 2017-08-17 11:37:43 -07:00
Adam Mendlik
898d69b1e1 Update kernelpkg documentation 2017-08-17 11:27:57 -06:00
Nicole Thomas
7960334fb7 Merge pull request #42195 from rares-pop/develop 
minion: add persistent minion_blackout support
 2017-08-17 10:50:41 -04:00
Nicole Thomas
fb8d6594da Merge pull request #41983 from vernondcole/enhancement/saltify_d 
flesh out saltify driver
 2017-08-17 10:26:53 -04:00
Dmitry Kuzmenko
cfddbf1c75 Apply code review: update the doc 2017-08-17 16:47:45 +03:00
rallytime
93c11d827a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
  - salt/minion.py
 2017-08-17 09:30:50 -04:00
rallytime
8a0f948e4a Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/utils/versions.py
  - tests/unit/modules/test_boto_elb.py
  - tests/unit/modules/test_boto_secgroup.py
  - tests/unit/states/test_boto_vpc.py
 2017-08-17 09:10:31 -04:00
rallytime
566ba4fe76 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/conf.py
 2017-08-17 09:03:44 -04:00
aajdinov
d365888489 Initial commit of oneandone salt cloud driver. 2017-08-17 08:03:01 +00:00
Vernon Cole
2a538f3bf4 Merge branch 'develop' into enhancement/saltify_d 2017-08-16 18:15:37 -06:00
rares-pop
1bbd1565d1 Merge branch 'develop' into develop 2017-08-16 10:52:48 +03:00
Denys Havrysh
44ed53b1df [DOCS] Fix link to Salt Cloud Feature Matrix 2017-08-16 10:26:45 +03:00
Jochen Breuer
1f1f910fd5 Fixed missing parenthesis 
The closing parenthesis was missing.
 2017-08-16 00:03:54 +02:00
Nicole Thomas
de809a934a Merge pull request #42576 from lyft/allow-returning-false-in-test-mode 
Document returning False in test=True mode
 2017-08-15 17:42:44 -04:00
Nicole Thomas
275122d04e Merge pull request #42834 from terminalmage/salt.utils.versions 
Move 4 functions from salt.utils to salt.utils.versions
 2017-08-15 17:28:24 -04:00
Mike Place
01d172a3f7 Merge pull request #42317 from garethgreenaway/fixing_beacons 
Refactoring Beacons
 2017-08-15 13:33:26 -06:00
Mike Place
eaaada5550 Merge pull request #42072 from onlyanegg/datadog-events_api 
Datadog events api
 2017-08-15 13:25:09 -06:00
Erik Johnson
2b76029ded Move 4 functions from salt.utils to salt.utils.versions 
This moves the following functions from salt.utils to salt.utils.versions:

- warn_until
- kwargs_warn_until
- compare_versions (as salt.utils.versions.compare)
- version_cmp
 2017-08-15 12:53:57 -05:00
Ch3LL
9c324d3d0c [develop] Bump latest and previous versions 2017-08-15 13:32:01 -04:00
Ch3LL
cbecf65823 [2017.7] Bump latest and previous versions 2017-08-15 12:55:02 -04:00
Ch3LL
74e7055d54 [2016.11] Bump latest and previous versions 2017-08-15 12:54:12 -04:00
Ch3LL
b551e66744 [2016.3] Bump latest and previous versions 2017-08-15 12:53:16 -04:00
Ch3LL
1d8f827c58 Add Security Notice to 2017.7.1 Release Notes 2017-08-15 12:37:50 -04:00
Ch3LL
a6f902db40 Add Security Notice to 2016.11.77 Release Notes 2017-08-15 12:35:37 -04:00
Ch3LL
d75d3741f8 Add Security Notice to 2016.3.7 Release Notes 2017-08-15 12:33:27 -04:00
garethgreenaway
c220372965 Merge branch 'develop' into datadog-events_api 2017-08-15 09:02:04 -07:00
garethgreenaway
8b48341a36 Merge branch 'develop' into fixing_beacons 2017-08-15 09:00:09 -07:00
Nicole Thomas
d8b7afbbd1 Merge pull request #42928 from UtahDave/remove_stormpath2 
Remove stormpath2
 2017-08-15 10:09:23 -04:00
David Boucha
0ceb8009c7 remove Stormpath module, states and docs 2017-08-14 16:03:00 -06:00
David Boucha
ed7430d91b Add note about removal to release notes 2017-08-14 15:54:19 -06:00
garethgreenaway
9e0499e551 Merge branch 'develop' into datadog-events_api 2017-08-14 12:08:01 -07:00
Gareth J. Greenaway
702e588b36 Updating the release notes to include more examples of old & new behavior for beacon configuration. Updating example documentation in one beacon. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
42afd62de8 Adding note in release notes for beacon configuration deprecation. 2017-08-14 12:04:38 -07:00
amalleo25
4e46c968e6 Update joyent.rst 
Missing colon in example cloud.profiles.d config file.
 2017-08-14 14:35:50 -04:00
rallytime
78e744bda4 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/fileclient.py
  - salt/modules/status.py
  - tests/integration/states/test_npm.py
 2017-08-14 14:21:17 -04:00
Dmitry Kuzmenko
afedd3b654 Typos and version fixes in the doc. 2017-08-14 18:08:40 +03:00
Nicole Thomas
c6ca7d639f Merge pull request #42889 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-14 10:16:19 -04:00
Mircea Ulinic
93be79a135 Index eos under the installation instructions list 2017-08-12 23:15:11 +01:00
Mircea Ulinic
f903e7bc39 Minor eos doc correction 2017-08-12 23:11:25 +01:00
Dmitry Kuzmenko
999388680c Make chunked mode in salt-cp optional (disabled by default). 
This reverts breaking of backward compatibility related to the cp.recv
interface change.
 2017-08-11 22:44:42 +03:00
Nicole Thomas
a3635926f3 Merge pull request #42879 from rallytime/oxygen-formatting 
Update header markup for subsections
 2017-08-11 15:24:30 -04:00
rallytime
29ff19c587 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/states/dockerng.py
  - salt/utils/cloud.py
 2017-08-11 15:17:19 -04:00
Nicole Thomas
3b9c3c5671 Merge pull request #42886 from sarcasticadmin/adding_docs_salt_outputs 
Adding missing output flags to salt cli docs
 2017-08-11 14:35:18 -04:00
Nicole Thomas
f43c141753 Merge branch 'develop' into datadog-events_api 2017-08-11 12:02:23 -04:00
rallytime
48445ff182 Update header markup for subsections 
The header section markup was incorrect in sections with sub-sections,
displaying the header text as smaller than the sub-section header text.

This fixes the header sizes
 2017-08-11 10:17:22 -04:00
Nicole Thomas
459fdedc67 Merge pull request #42678 from frankiexyz/2017.7 
Add eos.rst in the installation guide
 2017-08-11 09:58:36 -04:00
Erik Johnson
804a4e41a9 Merge pull request #42854 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-11 08:39:33 -05:00
amalleo25
559a2d448c Update joyent.rst 
Missing colon in example cloud.profiles.d config file.
 2017-08-10 23:08:38 -04:00
Erik Johnson
35e05c9515 Add note about git CLI requirement for GitPython to GitFS tutorial 2017-08-10 16:47:47 -05:00
Robert James Hernandez
744bf954ff Adding missing output flags to salt cli 2017-08-10 13:19:08 -07:00
rallytime
08bbcf5790 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
 2017-08-10 14:51:27 -04:00
rallytime
5d8d6225b5 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/augeas_cfg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/runners/manage.py
  - salt/states/boto_cfn.py
  - salt/utils/cloud.py
  - tests/integration/states/test_pkg.py
 2017-08-10 14:47:14 -04:00
Steven Joseph
50f1691cd8 Update documentation for azure arm dependencies 2017-08-10 13:19:45 +10:00
garethgreenaway
98e26dbc8f Merge branch 'develop' into fix-42819 2017-08-09 15:38:16 -07:00
rallytime
56b53c95e3 Fix build_type and release variables for develop branch 
The changes to 2017.7 were merged forward accidentally, in a section
that should have it's own settings. This restores the setting variables
for the develop branch.
 2017-08-09 11:52:15 -04:00
rallytime
152eb88d9f Update modules --> states in kubernetes doc module 
The kubernetes state docs are not rendering/building due to a typo
in the doc module.

Fixes #42639
 2017-08-08 14:42:34 -04:00
Erik Johnson
3184168365 Use explicit unicode strings + break up salt.utils 
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.

A summary of the changes in this PR is as follows:

* Moves the following functions from `salt.utils` to new locations
  (including a deprecation warning if invoked from `salt.utils`):
  `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
  `dequote`, `is_hex`, `is_bin_str`, `rand_string`,
  `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
  `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
  `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
  `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
  `is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
  `salt/utils/__init__.py` for better organization, so we can keep the
  deprecated ones separate from the ones yet to be deprecated as we
  continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
  unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
  import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
  accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
  such that it returns a string matching the passed size. Previously
  this function would get `size` bytes from `os.urandom()`,
  base64-encode it, and return the result, which would in most cases not
  be equal to the passed size.
 2017-08-08 13:33:43 -05:00
Nicole Thomas
3f59b22105 Merge branch 'develop' into develop 2017-08-08 13:53:43 -04:00
Ch3LL
90a2fb66a2 Fix typo for template_dict in http docs 2017-08-07 16:45:42 -04:00
vernoncole
e970b0623a flesh out saltify driver 
(cherry picked from commit 0a730fb)
 2017-08-07 10:21:48 -06:00
vernoncole
32ebe90fa4 make suggested changes to docs 
(cherry picked from commit 25ca2a8)
 2017-08-07 10:21:48 -06:00
vernoncole
681d2cd4bc manual merge of two conflicts 2017-08-07 10:21:48 -06:00
rallytime
f20f3742cb Merge branch '2017.7' into 'develop' 
Conflicts:
  - tests/unit/test_crypt.py
 2017-08-07 10:43:06 -04:00
Daniel Wallace
bca17902f5 add version added info 2017-08-03 09:01:34 -06:00
Daniel Wallace
4bbfc751ae render kubernetes docs 2017-08-03 09:01:34 -06:00
Frankie Hui
1598571f52 Add eos.rst in the installation guide 2017-08-02 17:47:31 +08:00
Alek Tant
2f9645c0d0 Merge branch 'develop' into patch-1 2017-07-31 21:17:13 -04:00
Mike Place
9d27719d3c Merge branch 'develop' into develop 2017-07-31 18:13:19 -05: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
fb81e78f71 Merge pull request #42603 from twangboy/win_fix_runas 
Add runas_passwd as a global for states
 2017-07-31 14:49:48 -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
twangboy
464ec34713 Fix another instance of runas_passwd 2017-07-28 11:20:48 -06:00
twangboy
4ea264e3db Change to runas_password in docs 2017-07-28 10:16:38 -06:00
Michael Gibson
0926591a7a Merge branch 'develop' into features/issue-42280 2017-07-28 10:08:25 -06:00
Nicole Thomas
1087a0a899 Merge pull request #42384 from letsmakesense/patch-1 
state_top value also affects pillar top file
 2017-07-28 09:50:54 -06:00
garethgreenaway
b08627949a Merge branch 'develop' into datadog-events_api 2017-07-27 16:39:46 -07:00
garethgreenaway
91236cf842 Merge branch 'develop' into preflight_cmds 2017-07-27 16:34:34 -07:00
Nicole Thomas
e2dd443002 Merge pull request #42601 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-27 16:32:06 -06:00
Nicole Thomas
22eea389fa Merge pull request #42290 from isbm/isbm-module_run_parambug_42270_217 
Backport of #42270
 2017-07-27 16:30:05 -06:00
twangboy
b9c91eba60 Add runas_passwd as a global for states 2017-07-27 15:46:58 -06:00
Michael Gibson
5099566c43 Merge branch 'develop' into features/issue-42280 2017-07-27 14:10:46 -06:00
rallytime
36a1bcf8c5 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_wua.py
  - salt/utils/schedule.py
  - tests/unit/modules/rabbitmq_test.py
 2017-07-27 14:00:15 -06:00
C. R. Oldham
2cc808e2b8 Add different bindpw behavior to the Oxygen release notes. 2017-07-27 13:56:13 -06:00
Mike Place
535c922511 Merge pull request #42523 from rallytime/fix-42375 
Add a mention of the True/False returns with __virtual__()
 2017-07-27 13:13:06 -05: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
Aneesh Agrawal
1f82f90fc9 Document returning False in test=True mode 
Currently, in test mode states always return None even on failure.
This masks failed states in highstate output,
which instead just look like they are going to make changes.

In some cases states can determine if they will fail even on a dry run,
e.g., if an API call to a service to determine the state of a
resource fails due to invalid credentials or a missing parameter.

In these cases, allow returning a result of False even in dry runs
to enable catching more errors at testing time.
 2017-07-26 22:00:16 +00: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
rallytime
685c2cced6 Add information about returning a tuple with an error message 2017-07-25 14:44:18 -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
rallytime
fa466519c4 Add a mention of the True/False returns with __virtual__() 
And their relationship to `__virtualname__`.

Fixes #42375
 2017-07-24 13:58:16 -06:00
rallytime
e3a6717efa Add info about top file to pillar walk-through example to include edit.vim 
The pillar example in the "Pillar Makes Simple States Grow Easily" section does
not meniton that the new file `/srv/pillar/edit/vim.sls` created for the example
must be included in the pillar top file in order for the references to work.

This PR adds that documentation so that the example works correctly.

Fixes #42405
 2017-07-24 12:17:41 -06:00
Nicole Thomas
c91a5e539e Merge pull request #42425 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-21 16:43:41 -06: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
Ch3LL
c10196f68c update windows urls to new py2/py3 naming scheme 2017-07-21 11:22:57 -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
Ch3LL
3f4a918f73 update windows urls to new py2/py3 naming scheme 2017-07-21 09:45:30 -04: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
rallytime
c673b64583 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/conf.py
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/engines/hipchat.py
  - salt/engines/slack.py
  - salt/grains/core.py
  - salt/version.py
  - tests/integration/states/test_renderers.py
 2017-07-20 09:54:08 -06: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
Rares Pop
ccb34f604a release notes: adding persistent minion_blackout 
Add the 'Persistent Minion Blackout' on the oxygen release notes.

Signed-off-by: Rares Pop <rares.pop@ni.com>
 2017-07-19 16:32:00 +03:00
letsmakesense
b234f80308 state_top value also affects pillar top file 
Hi,
thanks for making Saltstack. It's terrific. 
When I was looking for an option to change the name of the pillar top file I couldn't find anything, but I found out that 'state_top' also affects the name of pillar top file. My change tries to make this behaviour explicit.
Greetings,
Peter
 2017-07-19 11:29:18 +02: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
3e39526009 Merge pull request #42358 from Ch3LL/doc-update-develop 
[develop] Update version numbers in doc config for 2017.7.0 release
 2017-07-18 13:23:46 -06:00