valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
87,407 Commits 24 Branches 182 Tags 341 MiB
51a15cb2fc
Commit Graph

7917 Commits

Author SHA1 Message Date
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
vernoncole
f82ec9e72d Revert "Oxygen release notes for vagrant and saltify drivers" 
This reverts commit afbfe86
 2017-09-27 14:59:47 -06:00
vernoncole
a1a81eb906 supply Vagrant documentation 2017-09-27 14:59:47 -06:00
vernoncole
52acfd980d merge upstream develop 2017-09-27 14:26:32 -06:00
Ch3LL
9ba51646e0
[develop] Bump latest and previous versions 2017-09-27 12:31:20 -04:00
Ch3LL
410c624f7a
[2017.7] Bump latest and previous versions 2017-09-27 12:25:30 -04:00
Ch3LL
f72bc00000
[2016.11] Bump latest and previous versions 2017-09-27 12:24:09 -04:00
rallytime
dfef4a722c
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-27 11:48:39 -04:00
Nicole Thomas
fb86935d99 Merge pull request #43761 from Ch3LL/release_2017.7.2 
Release Notes for 2017.7.2
 2017-09-27 10:34:51 -04: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
rallytime
120f49f2c4
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/daemons/masterapi.py
  - salt/master.py
  - salt/runners/cache.py
 2017-09-26 16:46:43 -04:00
Erik Johnson
74379bac9c Merge pull request #43720 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-26 09:53:04 -05:00
rallytime
23bb4a5dde
Add GPG Verification section to Contributing Docs 
When we enable GPG Verification for pull request reviews, we should
make sure there is information available in our Contributing docs
about how to sign commits.
 2017-09-26 10:16:56 -04:00
Thomas S Hatch
d8f371b8b1 Merge pull request #43669 from moio/develop-limit-minion-processes 
Introduce process_count_max minion configuration parameter (develop)
 2017-09-26 05:56:11 -06:00
rallytime
babad12d83
Revise "Contributing" docs: merge-forwards/release branches explained! 
Fixes #43650

The merge-forward process needs a more prominent position and explanation
in the contributing documentation. This change attempts to explain this
process a little more fully and incorporates some changes to how we are
handling "main" release branches, "dot" release branches, and "develop"
in a more complete context with merge-forwards.
 2017-09-25 15:23:01 -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
Silvio Moioli
fd4194ade0 process_count_max: disable by default 2017-09-22 21:57:54 +02:00
Silvio Moioli
4d181ea523 process_count_max: add defaults and documentation 2017-09-22 21:57:02 +02:00
Mike Place
3a79549af4 Merge pull request #43467 from DSRCorporation/bugs/43124_users_regex 
Bugs/43124 users regex
 2017-09-22 13:21:08 -06:00
rallytime
e0ae50e489
Merge branch '2017.7' into 'develop' 
Conflicts:
  - pkg/salt.bash
  - salt/client/mixins.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/boto_vpc.py
  - salt/modules/win_pkg.py
  - salt/utils/reactor.py
  - tests/unit/utils/test_reactor.py
 2017-09-22 10:24:04 -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
Mike Place
ff832ee607 Merge pull request #43673 from rallytime/bp-43652 
Back-port #43652 to 2016.11
 2017-09-21 10:37:35 -06:00
Mike Place
365cb9fba8 Merge pull request #43677 from terminalmage/runners-docs-2016.11 
Fix RST headers for runners (2016.11 branch)
 2017-09-21 10:35:56 -06:00
rallytime
bd88c375d8
Add autodoc file for new purefa execution module 2017-09-21 11:51:15 -04:00
Erik Johnson
c0a79c70a4 Fix RST headers for runners (2017.7 branch) 
To conform with the rest of the rst files for runner docs, they should
only contain the module name.
 2017-09-21 10:27:12 -05:00
Erik Johnson
2fd88e94fa Fix RST headers for runners (2016.11 branch) 
To conform with the rest of the rst files for runner docs, they should
only contain the module name.
 2017-09-21 10:11:28 -05:00
Raymond Piller
d91c47c6f0 Salt Repo has Deb 9 and 8 2017-09-21 10:24:41 -04:00
Nicole Thomas
f66eb1c5ad Merge pull request #43588 from gtmanfred/do 
digitalocean should be one word.
 2017-09-21 09:25:38 -04:00
Nicole Thomas
f4eac59d96 Merge pull request #43652 from VertigoRay/patch-1 
Salt Repo has Deb 9 and 8
 2017-09-21 09:19:27 -04:00
Silvio Moioli
4a35fe5019 multiprocessing minion option: documentation fixes 2017-09-21 11:30:21 +02:00
Silvio Moioli
625eabb83f multiprocessing minion option: documentation fixes 2017-09-21 10:55:52 +02:00
Raymond Piller
5f47ef721c Salt Repo has Deb 9 and 8 2017-09-20 21:41:08 -05:00
Daniel Wallace
afaf76d0ba
add release note 2017-09-19 12:50:50 -06:00
Daniel Wallace
3bae894306
digitalocean should be one word. 
Everything on their webpage is a reference to DigitalOcean
 2017-09-19 12:47:16 -06:00
rallytime
57b9d642c2 Merge branch '2016.11.8' into '2016.11' 
No conflicts.
 2017-09-18 16:40:05 -04:00
Erik Johnson
b5f10696c2 Improve the reactor documentation 
This reorganizes the reactor docs and includes examples of the new
reactor SLS config syntax.
 2017-09-18 16:07:36 -04:00
Erik Johnson
7a2f12b96a Include a better example for reactor in master conf file 2017-09-18 16:07:36 -04:00
Mike Place
1a619708c1 Enhance engines docs 
Add a note about formatting to make it more clear.
 2017-09-18 13:44:44 -06:00
Mike Place
56b671e087 Merge pull request #43330 from terminalmage/issue43077 
Fix reactor regression + unify reactor config schema
 2017-09-18 10:46:10 -06:00
Dmitry Kuzmenko
14bf2dd8ff Support regex in publisher_acl. 2017-09-18 18:38:44 +03:00
Mircea Ulinic
40f36c9915 Merge branch 'develop' of github.com:saltstack/salt into napalm-beacon 2017-09-18 10:30:49 +00:00
haam3r
58f7d051c9 Issue #43479 No runners.config in 2017.7 branch 
Add extra note about needing to import the runners.config module from the develop branch when running on a 2017.7 release.
 2017-09-14 23:01:53 +03:00
Damon Atkins
b3dbafb035 Update doco 2017-09-14 12:28:23 -04:00
Damon Atkins
d4981a2717 Update doco 2017-09-14 12:25:30 -04:00
rallytime
bfcfcd75e8 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
  - salt/minion.py
  - salt/modules/alternatives.py
  - salt/modules/genesis.py
  - tests/unit/modules/test_hosts.py
  - tests/unit/modules/test_ini_manage.py
 2017-09-13 15:15:04 -04:00
Mike Place
9767e46ce4 Merge branch 'develop' into cisc_oxygen_release_notes 2017-09-13 10:45:24 -06:00
Erik Johnson
b85c8510c7 Improve the reactor documentation 
This reorganizes the reactor docs and includes examples of the new
reactor SLS config syntax.
 2017-09-13 10:35:23 -05:00
Erik Johnson
20f6f3cc39 Include a better example for reactor in master conf file 2017-09-13 10:35:23 -05: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
Mike Place
1a81663e46 Merge pull request #43302 from lyft/upstream-boto_cloudfront 
Upstream boto_cloudfront execution and state modules
 2017-09-12 10:10:20 -06:00
Olivier Mauras
139e065ce9 New pillar/master_tops saltclass module 2017-09-12 15:53:39 +02:00
Aneesh Agrawal
2e9f1999f6 Upstream boto_cloudfront execution and state modules 
AWS recently added support for tagging CloudFront distributions,
which allows us to start managing them via Salt
as we can insert a Salt-controlled identifier as a `Name` tag.
(CloudFront distributions get unique IDs generated by AWS,
which we can't predict and thus use to manage them idempotently.)
 2017-09-11 23:36:31 +00:00
Mike Place
5378ac7756 Merge pull request #41547 from cloudflare/px_merge_pillar_opts 
Override proxy minion opts with pillar data
 2017-09-11 15:47:50 -06:00
Mike Place
2ac185b055 Merge pull request #43439 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-11 15:18:40 -06:00
Mike Place
0e42e8f9cc Merge pull request #43188 from alexbleotu/ext_pillar_config_param-gh 
Ext pillar config param gh
 2017-09-11 12:58:01 -06:00
Mike Place
940995c40d Merge pull request #43273 from lordcirth/add-nfs-state 
Add nfs_export state
 2017-09-11 11:49:40 -06:00
rallytime
984fa35062 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/key.py
  - salt/modules/mount.py
  - salt/modules/system.py
  - tests/unit/modules/test_mount.py
  - tests/unit/modules/test_pam.py
  - tests/unit/modules/test_parted.py
 2017-09-11 12:55:39 -04:00
rallytime
ef7b4242c3 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-11 12:24:10 -04:00
rallytime
68f529ee5e Add 2016.11.8 release notes 2017-09-11 10:58:16 -04:00
Nicole Thomas
e638fac54e Merge pull request #43325 from doesitblend/salt-mine-doc-fix 
mine_interval option is minutes not seconds
 2017-09-07 12:58:10 -04:00
Alexandru Bleotu
103ef69016 Merge branch 'develop' into ext_pillar_config_param-gh 2017-09-06 18:49:37 +01:00
Nicole Thomas
d97a680372 Merge pull request #43333 from damon-atkins/2016.11 
Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug
 2017-09-06 10:21:34 -04:00
rallytime
7b07b58396 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/key.py
  - salt/modules/yumpkg.py
 2017-09-06 09:44:34 -04:00
Damon Atkins
92de2bb498 Update doco 2017-09-06 12:31:51 +10:00
Mike Place
1ddf818b41 Merge pull request #42336 from cloudflare/textfsm-mod 
New execution module: textfsm
 2017-09-05 17:28:30 -06: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
Mike Place
a414325a82 Merge pull request #43070 from lyft/support-states-returning-a-list-of-comments 
Support states returning a list for ret['comment']
 2017-09-05 16:19:26 -06: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
Mircea Ulinic
bfc374abd1 Index napalm beacon to autodoc 2017-09-04 16:43:29 +00:00
Mircea Ulinic
aad39ba665 Document the new opts 2017-09-04 14:17:14 +00:00
Mircea Ulinic
80c5479dfa Textfsm execution module autodoc 2017-09-04 13:29:39 +00:00
Ken Jordan
ba0cdd4536 Fix phrasing for mine_interval description 2017-09-01 15:13:20 -06:00
Ken Jordan
9ff03c2d43 Update Salt Mine documentation to show that the mine_interval option is configured in minutes. 2017-09-01 14:57:10 -06:00
rallytime
d891433214 Adjust test mocking to handle __utils__['state.check_result'] 2017-09-01 16:09:59 -04:00
rallytime
8127bca9ed Use __utils__ where possible for moved state utils 
And update all references to new state names in salt.utils.state.py
 2017-09-01 16:09:59 -04:00
rallytime
4a86f23bf1 Move state-related utils to salt.utils.state.py 
Moves the following functions from `salt.utils` to `salt.utils.state`:
- gen_state_tag
- search_onfail_requisites
- check_onfail_requisites
- check_state_result

Original functions have a deprecation warning added and all references
in Salt code were updated to use the new function path, including moving
some unit tests.
 2017-09-01 16:09:59 -04:00
vernoncole
5de8f9ce3e Oxygen release notes for vagrant and saltify drivers 2017-08-31 14:40:46 -06:00
Nicole Thomas
bab9a49418 Merge branch 'develop' into ext_pillar_config_param-gh 2017-08-30 17:44:41 -04:00
Nicole Thomas
237e5ce697 Merge pull request #43250 from rallytime/utils-path-fixes 
Update some salt.utils.x paths for moved util functions
 2017-08-30 15:09:02 -04: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
26410c662f Update some salt.utils.x paths for moved util functions 
Through merge forwards, some of the old-style paths have made their
way into develop. This PR corrects some of these instances on the more
popular functions.
 2017-08-29 16:24:47 -04:00
rallytime
0d5a46dbaa Update release branch section with a few more details 2017-08-29 09:38:11 -04:00
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