valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,914 Commits 24 Branches 182 Tags 341 MiB
a7a1b293c7
Commit Graph

1444 Commits

Author SHA1 Message Date
rallytime
c4ae4a6b50
Merge branch '2017.7.2' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.2.rst
 2017-10-16 13:53:13 -04:00
twangboy
a0972704e5
Fix bad headings 2017-10-16 10:51:34 -06:00
twangboy
601d8bc5af
Add release notes 2017-10-16 10:51:34 -06:00
garethgreenaway
22dbed1e45 Merge branch 'develop' into vagrant-cloud 2017-10-13 13:08:50 -07:00
Nicole Thomas
a85837d72b Merge pull request #44066 from Ch3LL/cherry_release 
Add Known CherryPy Issue to 2017.7.2 Release Notes
 2017-10-12 11:18:24 -04:00
Ch3LL
8e597fcce9
Add Known CherryPy Issue to 2017.7.2 Release Notes 2017-10-12 09:33:59 -04:00
Vernon Cole
e9c7c69402
documentation for vagrant cloud & state 2017-10-11 05:02:26 -06:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-10-10 16:34:52 -04:00
Ch3LL
027f509368
Add 2017.7.3 Release Note File 2017-10-10 15:33:42 -04:00
Ch3LL
7f9015eb41
Add 2016.11.9 Release Note File 2017-10-10 15:31:19 -04:00
Nicole Thomas
33e0353858 Merge branch 'develop' into vmm_grain 2017-10-10 09:01:33 -04:00
Mike Place
e434c39c4e Merge pull request #43960 from cro/ldap_nopw_bind2 
Require that bindpw be non-empty when auth.ldap.anonymous is False
 2017-10-09 17:09:01 -06:00
garethgreenaway
e9dfda2177 Merge pull request #43991 from Ch3LL/3.8_sec_2 
Add Security Notes to 2016.3.8 Release Notes
 2017-10-09 15:00:24 -07:00
Ch3LL
1977df8462
Add Security Notes to 2016.3.8 Release Notes 2017-10-09 16:26:13 -04:00
Ch3LL
57fd6f7bcb
Add Security Notes to 2017.7.2 Release Notes 2017-10-09 13:09:58 -04:00
Ch3LL
f0c3184288
Add Security Notes to 2016.11.8 Release Notes 2017-10-09 13:03:23 -04:00
C. R. Oldham
9df3d91d8f
Release notes blurb for change to bindpw requirements 2017-10-06 15:33:10 -06:00
Nicole Thomas
7785919437 Merge pull request #43829 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-10-05 16:09:23 -04:00
Eric Radman
1a9f12fd67
Detect OpenBSD guest running under VMM(4) 
grains.manufacturer is 'OpenBSD' when running under VMM
 2017-10-02 17:45:37 -04:00
rallytime
2337904656
Add updated release notes to 2017.7.2 branch 2017-10-02 17:18:30 -04:00
Nicole Thomas
9f25a1c2dd Merge pull request #43503 from The-Loeki/high-out-by_id 
Additional highstate output modes; changes_id, filter_id, terse_id, full_id
 2017-10-01 10:14:26 -04:00
rallytime
a38ceab7cf
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/master.py
  - salt/utils/path.py
  - tests/unit/modules/test_state.py
 2017-09-29 11:48:33 -04:00
garethgreenaway
61280cc0c3 Merge branch 'develop' into release-note-formatting 2017-09-28 19:49:12 -07:00
Nicole Thomas
3f77571dad Merge branch 'develop' into high-out-by_id 2017-09-28 13:27:47 -04:00
Ch3LL
50779c3b1c
Add note to nitrogen release notes about pip for cent6 2017-09-28 11:50:54 -04:00
Simon Dodsley
cdafbe2068
Update Oxygen Release notes with new grains and module 
Also do a final cosmetic fix to the purefa module documentation
 2017-09-28 07:26:30 -07:00
rallytime
d862a6f3f2
Fix some formatting issues on the oxygen release notes page 2017-09-28 09:52:04 -04:00
Mike Place
6a25bf4475 Merge pull request #42349 from coredumb/saltclass 
New pillar/master_tops saltclass module
 2017-09-28 14:26:45 +02:00
Ch3LL
caf5795856
add mac patch notes 2017-09-26 17:27:29 -04:00
Ch3LL
3d5fce0955
Add 2017.7.2 Release Notes 2017-09-26 17:21:24 -04:00
Ronald van Zantvoort
a2234e45e2 Update release note docs regarding _id highstate output modes 2017-09-25 18:37:48 +02:00
Ronald van Zantvoort
bfbca748e2 highstate output: Document additional output modes 2017-09-25 18:32:52 +02:00
rallytime
281cbbe048
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/libvirt.py
  - salt/daemons/masterapi.py
  - salt/modules/file.py
  - salt/modules/yumpkg.py
  - salt/states/archive.py
  - salt/states/file.py
  - salt/utils/files.py
  - salt/utils/minions.py
 2017-09-25 09:40:18 -04:00
rallytime
fca4e5563a
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/utils/test_parsers.py
 2017-09-22 09:40:03 -04:00
Daniel Wallace
afaf76d0ba
add release note 2017-09-19 12:50:50 -06:00
Mike Place
9767e46ce4 Merge branch 'develop' into cisc_oxygen_release_notes 2017-09-13 10:45:24 -06:00
Mike Place
15ffecd4a7 Give the name of the roster 2017-09-12 15:44:26 -06:00
Mike Place
eba40686e8 Add information about cimc to release notes 2017-09-12 14:39:00 -06:00
Mike Place
27315c31c8 Add release note about ssh rosters 2017-09-12 10:41:06 -06:00
Olivier Mauras
139e065ce9 New pillar/master_tops saltclass module 2017-09-12 15:53:39 +02:00
rallytime
68f529ee5e Add 2016.11.8 release notes 2017-09-11 10:58:16 -04:00
Nicole Thomas
f19274e1b4 Merge pull request #43222 from rallytime/oxygen-warnings-env 
Remove deprecation warnings for "env"
 2017-09-05 18:24:54 -04:00
Aneesh Agrawal
ba63920874 Support states returning a list for ret['comment'] 
Some states are complicated and multiple subparts,
or maybe cross-call into __states__ if they manage subresources.
In these cases, they will have multiple comments.
Make this more ergonomic by supporting a list of strings as the
value for ret['comment'] in state returns and documenting this.
By joining comments on newlines, it is possible to combine
single-line and multi-line comments cleanly, as opposed to e.g. commas.

The driving impetus for this is some of the boto modules.
An update to the boto_sqs module is included as an example.

Add a check that outgoing state return data has the right shape,
and add a testcase as well.
Fix the NPM state tests and the saltmod runner & wheel state functions
to comply with the prescribed format.
 2017-09-05 19:52:42 +00:00
Nicole Thomas
a972c4fb8c Merge pull request #42840 from StreetHawkInc/update_azurearm 
Update salt-cloud azurearm to work with latest sdk
 2017-08-30 12:01:34 -04: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
5901b10c14 Remove deprecated Legacy Git Pillar code 2017-08-23 16:49:58 -04:00
Mike Place
449c4c53c3 Add release note for nacl renderer 
Refs #41868
 2017-08-22 13:38:21 -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
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
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
rares-pop
1bbd1565d1 Merge branch 'develop' into develop 2017-08-16 10:52:48 +03: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
8b48341a36 Merge branch 'develop' into fixing_beacons 2017-08-15 09:00:09 -07:00
David Boucha
ed7430d91b Add note about removal to release notes 2017-08-14 15:54:19 -06: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
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
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
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
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
garethgreenaway
91236cf842 Merge branch 'develop' into preflight_cmds 2017-07-27 16:34:34 -07: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
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
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
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
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
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
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
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
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
rallytime
ffd3fae2c9 Add this change to the Oxygen release notes 2017-07-13 16:46:36 -06:00
rallytime
ccd78ed791 Remove Oxygen deprecation warning in lxc execution module 2017-07-13 16:42:42 -06:00
Bo Maryniuk
e38d432f90 Fix docs 2017-07-13 10:11:32 +02:00
Bo Maryniuk
1e8a56eda5 Describe function tagging 2017-07-13 10:11:21 +02:00
Bo Maryniuk
1d7233224b Describe function batching 2017-07-13 10:11:13 +02:00
Bo Maryniuk
1391a05d5e Bugfix: syntax error in the example 2017-07-13 10:11:07 +02:00
Nicole Thomas
5f01dccf8f Merge pull request #42214 from gtmanfred/develop 
allow not verifying ssl winrm saltcloud
 2017-07-11 17:33:21 -06:00
Daniel Wallace
ce6b05d237 add release note 2017-07-07 13:15:30 -06:00
rallytime
8d960d463a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/grains/core.py
 2017-07-06 17:42:30 -06:00
Ch3LL
e1694af39c Update builds available for rc1 2017-07-05 17:06:06 -04:00
Daniel Wallace
e2b3160c96 fix up PR 2017-07-05 10:41:26 -06:00
Daniel Wallace
6fbde35d11 add note about roster_defaults 2017-07-05 10:23:07 -06:00
Daniel Wallace
ea5ae2e468 add release note about about extmod blacklist and whitelist 2017-07-05 10:23:07 -06:00
Daniel Wallace
db0ed458d8 Update salt-master first before updating salt-minion 
Fixes #42124
 2017-07-05 10:23:07 -06:00
rallytime
8b35b367b3 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/dockerng.py
 2017-07-05 09:14:30 -06:00
Ch3LL
d4e7b91608 Update releasecanddiate doc with new 2017.7.0rc1 Release 2017-07-03 23:06:54 -04:00
Ch3LL
1de5e008a0 Add initial 2016.11.7 Release Notes 2017-06-30 11:32:10 -04:00
Erik Johnson
9a50e7c1ca Merge remote-tracking branch 'upstream/2017.7' into merge-develop 2017-06-28 22:10:50 -05:00
rallytime
e512a29f08 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/state.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - salt/version.py
  - tests/unit/config/test_config.py
  - tests/unit/modules/test_zypper.py
 2017-06-28 11:31:53 -06:00
rallytime
7d7be2d375 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/ref/configuration/master.rst
  - tests/integration/states/test_archive.py
  - tests/unit/transport/test_tcp.py
  - tests/unit/transport/test_zeromq.py
 2017-06-28 10:48:37 -06:00
Bo Maryniuk
c2b5e50d50 Add missing doc info for pressrelease 2017-06-26 14:38:19 +02:00
Mike Place
3bc07d2f7c
Line breaks 2017-06-22 09:24:55 -06:00
Mike Place
679040c04b
Locale doc 2017-06-21 16:06:59 -06:00
Ch3LL
4e1239d980 Add additional commits to 2016.11.6 release notes 2017-06-21 17:15:11 -04:00
Erik Johnson
1279f56c56 gitfs: Add two new options to affect saltenv mapping 
This adds 2 new config options:

- gitfs_disable_saltenv_mapping - This allows a user to disable the environment mapping logic and rely solely on per-saltenv configuration
- gitfs_ref_types - This allows individual ref types to be ignored

It also includes a performance improvement in retrieving tree objects
matching the desired ref name. Before, we would iterate through the
different refs and check if the name matched the desired ref's name.
Now we just check for a head/tag ref based on the ref path in the
gitdir (e.g. refs/remotes/origin/master or refs/tags/v1.2.3). This
prevents us from needlessly iterating through all refs until a match is
found, which does not scale well when the number of branches and tags is
larger.
 2017-06-21 12:42:48 -05:00
Erik Johnson
63823f3436 Do not merge master_tops and top file matches using set union 
The code which integrates master_tops SLS matches with top file SLS
matches was using set operations to ensure there were no duplicate
matches. However, the process of first converting the matches to a set,
and then performing a union on the two sets, has the side effect of
making the ordering unpredictable.

The set operations have been removed in favor of list comprehensions.
This ensures that the ordering is predictable, and that master_tops
matches are executed *after* top file matches.

In addition, a new minion config option called "master_tops_first" has
been added to allow for the master_tops matches to be executed *before*
top file matches.
 2017-06-20 15:04:34 -05:00
Ch3LL
75f93edff2 Update 2017 Release Notes with Python Messages 2017-06-20 09:55:13 -04:00
rallytime
add5b118a3 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/yumpkg.py
  - tests/unit/templates/test_jinja.py
 2017-06-19 14:12:36 -06:00
Mircea Ulinic
fae959d24b Remove duplicate mattermost ref 2017-06-19 09:52:54 +00:00
Mircea Ulinic
d8dc8a338b Add redis cache reference 2017-06-19 09:52:33 +00:00
rallytime
58262608cd Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/master.py
  - salt/modules/zypper.py
  - tests/unit/modules/timezone_test.py
 2017-06-16 10:43:02 -06:00
Mike Place
9c45fa044d Merge pull request #41748 from terminalmage/issue3415 
Add comparison operator support for package installation in yum/dnf and apt
 2017-06-15 15:32:37 -05:00
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
 2017-06-15 10:57:27 -06:00
Mike Place
e685858269 Merge pull request #41750 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-06-14 17:15:40 -05:00
Ch3LL
fa368f21ac
Add Change Log to 2016.11.6 Release Notes 2017-06-14 16:00:50 -04:00
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - conf/master
  - salt/utils/schedule.py
 2017-06-14 13:24:11 -06:00
Erik Johnson
f1d7eb4166 Add comparison operator feature to Oxygen release notes 2017-06-14 13:47:49 -05:00
rallytime
c5b75d030a Update Nitrogen references to 2017.7.0 in doc/* 2017-06-14 11:36:06 -06:00
C. R. Oldham
dadf4b851c Add documentation to the example master and minion configuration files. 
Move minion event signing to a saner place.
Enable dropping messages when signature does not verify or when
minion is not adding the signature to its payloads.
 2017-06-08 13:18:53 -06:00
rallytime
396b06fdf8 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-06-07 09:54:20 -06:00
Mike Place
94aa1876d4 Merge pull request #41546 from cloudflare/dns-grains 
Add host_dns grain for napalm
 2017-06-06 15:00:07 -05:00
Mircea Ulinic
564f2d1e3d Indent correctly the code block 2017-06-06 15:23:14 +00:00
Mircea Ulinic
b70df6e576 Reference new Jinja filters in the release notes 2017-06-06 15:15:06 +00:00
Mircea Ulinic
2a8c5cef04 Add notes regarding other new features 2017-06-06 14:18:01 +00:00
Mircea Ulinic
b59760fae2 Fix indentation for better display 2017-06-06 13:52:01 +00:00
Mircea Ulinic
ad4e6e5ec5 salt.beacons.log instead of 'Log' 2017-06-06 13:46:38 +00:00
Mircea Ulinic
36985bb1ed Remove service state, not a new one 2017-06-06 13:45:02 +00:00
Mircea Ulinic
b6b6a51846 Index new modules introduced in Nitrogen 2017-06-06 13:41:32 +00:00
Mircea Ulinic
6b1b05129c Remove the reference to the profile outputter 2017-06-06 12:49:04 +00:00
Mircea Ulinic
fb12353a1d Insert note in the Nitrogen release 2017-06-01 11:42:53 +00:00
rallytime
ff417db115 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - doc/topics/venafi/index.rst
  - pkg/salt-proxy@.service
  - salt/config/__init__.py
 2017-05-26 11:27:24 -06:00
rallytime
9ff2694155 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py
 2017-05-24 16:32:59 -06:00
Benjamin Drung
33a7f8b2ec Fix typos 
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-24 12:50:29 +02:00
rallytime
718b0adc70 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/modules/zypper.py
  - tests/unit/utils/test_network.py
 2017-05-23 09:05:13 -06:00
Mike Place
337d00fbf9 Merge pull request #41352 from whiteinge/rest_cherrypy-cors-token 
rest_cherrypy CORS fix & /token endpoint
 2017-05-22 11:03:04 -05:00