rallytime
5c5b74b09a
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- pkg/windows/req.txt
2017-03-22 17:20:58 -06:00
rallytime
2ead188b4f
Update release notes for 2016.3.6
2017-03-22 14:21:29 -06:00
C. R. Oldham
bb71710747
Revert "Add special token to insert the minion id into the default_include path"
2017-03-21 13:41:03 -06:00
rallytime
a55c4138a8
Merge branch '2016.3' into '2016.11'
...
No conflicts.
2017-03-21 10:13:56 -06:00
Erik Johnson
a42be82993
Link to minion start reactor example from FAQ.
...
This provides a natural solution to the chicken-and-egg problem
identified in the FAQ. It also changes the name of the event in the
reactor example, as I think we may have stopped sending the legacy
(i.e. not-namespaced) events, so the "minion_start" event in the example
would be incorrect.
2017-03-21 10:01:20 -05:00
Ch3LL
9c6d8d892f
additional PRs/issues for 2016.3.6 release notes
2017-03-20 15:45:29 -06:00
rallytime
626bd03885
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/runners/manage.py
2017-03-16 10:43:18 -06:00
Ch3LL
a1f8b49bd1
update 2016.3.6 release notes with additional PR's
2017-03-15 16:34:17 -06:00
rallytime
72d16c9fa9
Update "yaml" code-block references with "jinja" where needed
...
There are many `.. code-block: yaml` definitions that should really
be `.. code-block: jinja` definitions. This commit cleans up some
of those and removes warnings like these from the doc build:
```
WARNING: Could not lex literal_block as "yaml". Highlighting skipped.
```
2017-03-15 10:22:19 -06:00
rallytime
029f28bbd5
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/cmdmod.py
2017-03-14 15:44:38 -06:00
Mike Place
60066da614
Merge pull request #39924 from dmurphy18/salt_aix_fixMar
...
Add AIX support for user and group execution modules
2017-03-14 15:04:01 -06:00
Ch3LL
f3e7e4fb2a
Add 2016.3.6 Release Notes
2017-03-14 13:39:48 -06:00
Mike Place
6350b07384
Merge pull request #39952 from vutny/doc-faq-minion-upgrade-restart
...
Fix #7997 : describe how to upgrade Salt Minion in a proper way
2017-03-10 11:41:56 -07:00
Mike Place
dc7d4f4224
Merge pull request #39935 from cro/namespace_proxy_cfg
...
Add special token to insert the minion id into the default_include path
2017-03-10 10:51:54 -07:00
Denys Havrysh
d989d749d6
Fix #7997 : describe how to upgrade Salt Minion in a proper way
2017-03-10 16:17:19 +02:00
rallytime
c8b5d390b5
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/minion.py
2017-03-09 16:05:15 -07:00
C. R. Oldham
e4aef54c73
Add special token to insert the minion id into the default_include path
2017-03-09 15:31:16 -07:00
David Murphy
5077c989bb
Updated changes file for added AIX support
2017-03-09 09:38:35 -07:00
Ronald van Zantvoort
170cbadc54
CIDR matching supports IPv6, update docs
...
After #22080 IPv6 CIDR matching is supported & functional, docs should('ve) reflected that since 2015.8
2017-03-09 13:52:13 +01:00
Joseph Hall
35440c5936
Add installation tips for azure
2017-03-07 12:12:56 -07:00
Joseph Hall
2a1ae0bf2e
Change example master in azure docs
2017-03-07 10:01:09 -07:00
Mike Place
4002dc1947
Merge pull request #39819 from terminalmage/top-file-matching-docs
...
Improve the Top File matching docs
2017-03-04 09:06:39 -07:00
Jan Kadlec
804b12048c
Add missing apostrophe
2017-03-03 17:58:53 +01:00
Erik Johnson
7178e77eee
Improve the Top File matching docs
...
In 2014.7.0, default matcher in the top file was changed to the compound
matcher, but the docs still suggest that it is the glob matcher. This
commit updates the docs to explicitly mention that the compound matcher
is now the default, and adds a table describing all of the available
matchers that can be set in the top file.
2017-03-03 10:40:22 -06:00
rallytime
65b239664e
Restore ipv6 connectivity and "master: <ip>:<port>" support
2017-03-01 14:15:07 -07:00
Ch3LL
1853c998c4
add initial 2016.11.4 release notes
2017-03-01 09:47:07 -07:00
Nicole Thomas
7b4865c058
Merge pull request #39729 from rallytime/update-release-ver-2016.11
...
[2016.11] Bump latest release version to 2016.11.3
2017-02-28 11:08:25 -07:00
rallytime
b5a7111ad9
[2016.11] Bump latest release version to 2016.11.3
2017-02-28 09:03:05 -07:00
rallytime
c9bc8af8f2
[2016.3] Bump latest release version to 2016.11.3
2017-02-28 09:01:24 -07:00
Denys Havrysh
1d86cf1161
DOCS: add 2nd level header for advanced targeting methods
2017-02-28 16:23:53 +02:00
rallytime
13622899d2
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- doc/topics/development/contributing.rst
2017-02-23 14:37:48 -07:00
Mike Place
652044b18f
A note in the docs about mentionbot
2017-02-22 19:34:02 -07:00
Mike Place
5987c4e30e
Merge pull request #39573 from thatch45/ssl_docs
...
Added a few more comments to the ssl docs
2017-02-22 19:17:13 -07:00
Mike Place
b8e321cbec
Merge pull request #39577 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-02-22 19:10:11 -07:00
rallytime
7b9b3f700d
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/dockerng.py
- salt/states/dockerng.py
2017-02-22 16:27:08 -07:00
Ch3LL
c0f8c35df7
fix reference to set in docs
2017-02-22 16:09:16 -07:00
Ch3LL
663f6f159d
add additional PRs to 2016.11.3 release notes
2017-02-22 16:04:05 -07:00
Thomas S Hatch
b230c35eac
This should be good to go now
2017-02-22 14:29:24 -07:00
Mike Place
c10965833a
Merge pull request #39289 from bobrik/autodetect-ipv6
...
Autodetect IPv6 connectivity from minion to master
2017-02-22 12:05:32 -07:00
Mike Place
b492f7094c
Merge pull request #39528 from thatch45/ssl_docs
...
Add better ssl option docs
2017-02-22 11:29:46 -07:00
rallytime
c613d19e76
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/dockerng.py
- salt/states/dockerng.py
2017-02-21 13:59:14 -07:00
Thomas S Hatch
c357e37831
Add minion config
2017-02-21 11:09:46 -07:00
Thomas S Hatch
539bb2aa80
Add better ssl option docs
2017-02-21 08:48:42 -07:00
Cory Wright
cc90d0d53f
The Reactor docs should use pillar='{}' instead of 'pillar={}'
2017-02-17 11:07:39 -06:00
Mike Place
e9b034f02f
Merge pull request #39458 from rallytime/fixup-more-doc-build-warnings
...
Fix more warnings in doc build
2017-02-16 14:45:51 -07:00
Mike Place
e4f8c2bfb0
Merge pull request #39437 from sakateka/fixes_about_saltfile
...
Fixes about saltfile
2017-02-16 13:32:14 -07:00
rallytime
e698bc3508
Fix more warnings in doc build
2017-02-16 11:20:35 -07:00
Megan Wilhite
1acf00da3b
add 2016.11.3 changelog to release notes ( #39451 )
2017-02-16 10:49:53 -07:00
Mike Place
8e2cbd2307
Merge pull request #39448 from gtmanfred/2016.11
...
Add release notes for cisco proxy minions added in Carbon
2017-02-16 10:29:47 -07:00
Daniel Wallace
3172e88700
Add release notes for cisco proxy minions added in Carbon
2017-02-16 10:05:33 -06:00