valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,189 Commits 24 Branches 182 Tags 341 MiB
db6eadd6c3
Commit Graph

7250 Commits

Author SHA1 Message Date
Joseph Hall
5940679658 Fix function name 2017-03-27 08:25:38 -06:00
Joseph Hall
18ee1d1443 Update documentation for maps 2017-03-27 08:19:04 -06:00
Nicole Thomas
d73a526fba Merge pull request #40309 from rallytime/redis-cache-docs 
Move "redis" to "redis_cache" references in docs
 2017-03-24 16:40:07 -06:00
Nicole Thomas
0031a61f80 Merge pull request #40286 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-24 16:09:47 -06:00
rallytime
5363e0b58b Update minion data cache documentation 
Updats the existing documentation and also adds more documentation
to the Multi-Master and Syndic topology files about the addition
of the pluggable minion data store.
 2017-03-24 14:25:46 -06:00
rallytime
2a483a256a Move "redis" to "redis_cache" references in docs to allow redis_cache docs to build 2017-03-24 12:36:31 -06:00
David Boucha
3ba50d3c52 add info about what is cached 2017-03-24 11:49:26 -06:00
David Boucha
77e8f6aff9 fix config example 2017-03-24 11:49:26 -06:00
David Boucha
61f2fa9339 Add documentation for the Minion data cache 
Includes docs for localfs and consul minion data cache modules
 2017-03-24 11:49:26 -06:00
Vitali Quiering
91f2963922 Add logstash engine protocol to manual 2017-03-24 17:03:22 +01:00
Vitali Quiering
250a0b5ab4 Add logstash engine protocol to engines doc 2017-03-24 17:01:38 +01:00
Mircea Ulinic
07a8645611 Add NAPALM section in Nitrogen release notes 2017-03-24 13:22:38 +00:00
Tyler Goodlet
8bfa8e0d15 Document qcow support 2017-03-23 23:36:32 -04:00
Mircea Ulinic
14923b6fde Adding proxy module changes under Nitrogen release notes 2017-03-24 01:55:48 +00:00
Mircea Ulinic
a0a2f60961 Note proxy_merge_grains_in_module 2017-03-24 01:55:48 +00:00
Mircea Ulinic
5919d612b2 Adding Nitrogen notes to the proxy topic 2017-03-24 01:55:48 +00:00
Mircea Ulinic
01e9de2d04 Add proxy to index 2017-03-24 01:55:48 +00:00
Mircea Ulinic
09670fe9a0 Reference proxy options 2017-03-24 01:55:48 +00:00
rallytime
dbf74330ec Merge branch '2016.11' into 'develop' 
Conflicts:
  - pkg/windows/req_base.txt
  - salt/modules/ssh.py
 2017-03-23 16:40:44 -06:00
Ronald van Zantvoort
9aaeabd415 cache roster: Add Salt SDB support 2017-03-23 23:03:45 +01:00
Mike Place
e462a04d70 Merge pull request #40200 from DSRCorporation/features/zh864_auth_redesign 
E-Auth refactoring
 2017-03-23 13:32:20 -06:00
rallytime
235a768872 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/returners/influxdb_return.py
  - salt/states/dockerng.py
  - salt/utils/schedule.py
  - tests/unit/modules/test_docker.py
  - tests/unit/states/dockerng_test.py
  - tests/unit/utils/test_schedule.py
 2017-03-22 17:44:08 -06:00
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
Mike Place
54a9796f39 Merge pull request #40060 from techhat/venafi 
Add Venafi support
 2017-03-22 13:19:15 -06:00
Mike Place
5a1f352c59 Merge pull request #39749 from nafg/patch-1 
WIP: Add "Edit on GitHub" link to the docs
 2017-03-22 12:48:34 -06:00
Mike Place
d765661c54 Merge pull request #39996 from terminalmage/docker-overhaul 
Overhaul Docker support
 2017-03-22 12:10:06 -06:00
Mike Place
7fbb435796 Merge pull request #40040 from jerrykan/apt_key_text 
Add `key_text` option to apt `pkgrepo.managed` (closes #37936)
 2017-03-22 12:08:38 -06:00
Dmitry Kuzmenko
f3a970eec1 Added release notes. 2017-03-22 19:15:21 +03:00
Erik Johnson
b77f5b9630 Add warning about possible replaced containers on first run after upgrade 2017-03-22 09:19:20 -05:00
Dmitry Kuzmenko
b09d83b6d7 Allow to use different auth module for ACL. 2017-03-22 11:49:33 +03:00
Dmitry Kuzmenko
9309a83d21 Optionally keep auth list in token. 2017-03-22 11:49:33 +03:00
Erik Johnson
5ad476936d Overhaul Docker support 
This does the following:

- Splits states for container/volume/image/network management into four
  separate state modules.

- Preserves backward compatibility by making ``docker.image_present``
  invoke ``docker_image.present``, etc.

- Changes how Salt detects that a container needs to be replaced.
  Instead of comparing each passed argument to the named container's
  configuration, it creates a temporary container, and compares that
  container to the named container. If the two differ, then the older
  container is removed, and the new one is renamed and started, becoming
  the named container.

- Removes the unit tests for container management and replaces them with
  integration tests.

- Adds unit tests for the new salt.utils.docker
 2017-03-21 16:53:19 -05:00
Nicole Thomas
33e918e3d1 Merge pull request #40185 from cloudflare/proxy-docs 
Proxy docs
 2017-03-21 14:24:49 -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
Nicole Thomas
c284a82dfa Merge pull request #40032 from tgoodlet/virt_fixups 
Some random salt-virt bug fixes and docs fixups
 2017-03-21 10:32:42 -06:00
rallytime
a55c4138a8 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-03-21 10:13:56 -06:00
Joseph Hall
7e48e5da05 Address comments from @cro 2017-03-21 10:05:27 -06:00
Walter Goulet
bdd18d874d Added support for generating key based on configured policy and to use updated flattened APIs 2017-03-21 09:47:28 -06:00
Mike Place
3370d2de7c Merge pull request #39891 from isbm/isbm-translate-varargs 
Introduce "module.xrun"
 2017-03-21 09:23:28 -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
Mircea Ulinic
01c5c77305 Add proxy_always_alive option from #40178 2017-03-21 14:59:16 +00:00
Mircea Ulinic
186a6c4f2a Add proxy options doc 2017-03-21 14:59:16 +00:00
Mircea Ulinic
97343733ad Proxy config Examples 2017-03-21 14:59:16 +00:00
Mircea Ulinic
1ba599b784 Include proxy config instructions 2017-03-21 14:59:11 +00:00
Ch3LL
9c6d8d892f additional PRs/issues for 2016.3.6 release notes 2017-03-20 15:45:29 -06:00
Bo Maryniuk
3ba87e495b Release note fix 2017-03-20 22:31:54 +01:00
Bo Maryniuk
18d85b1ab8 Fix docstring to the new opt-in deprecation policy 2017-03-20 22:31:54 +01:00
Bo Maryniuk
6579f113d2 Fix release notes 2017-03-20 22:31:53 +01:00
Bo Maryniuk
b6c513e458 Add newlines for markdown 2017-03-20 22:31:53 +01:00
Bo Maryniuk
ffa7035558 Add the option to the Nitrogen Release Notes 2017-03-20 22:31:53 +01:00
Seth House
7ccaf1c9dd Add note about the jobs runner to the external job cache docs 2017-03-20 13:40:14 -06:00
rallytime
caebd5d8cf Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/targeting/nodegroups.rst
  - salt/runners/manage.py
 2017-03-16 17:23:57 -06:00
Nicole Thomas
d64dee46bd Merge pull request #40061 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-16 11:16:52 -06:00
rallytime
626bd03885 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/runners/manage.py
 2017-03-16 10:43:18 -06:00
Mircea Ulinic
c92b42d9af Add logmod doc 2017-03-16 14:00:39 +00:00
Ch3LL
a1f8b49bd1 update 2016.3.6 release notes with additional PR's 2017-03-15 16:34:17 -06:00
rallytime
148df32604 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-03-15 14:52:07 -06:00
Joseph Hall
55adc635b9 Remove obvious depends from the docs 2017-03-15 14:51:48 -06:00
Joseph Hall
be33cd8146 Add Venafi support 2017-03-15 14:50:07 -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
John Kristensen
8e92152533 Add key_text option to apt pkgrepo.managed (closes #37936) 
It may not always possible or desirable to upload a GPG key to a
keyserver (`keyid`/`keyserver`) or to host it on remote server
(`key_url`). This just leaves storing the key in a state using a
`salt://` URL.

It seems like the states is the wrong place to hold this sort of data,
and would be more suited to being in the pillar.

Adding a `key_text` option to the apt `pkgrepo.managed` module, which
accepts a GPG key in string form, can assist in importing a GPG key from
pillar data.
 2017-03-16 00:25:21 +11:00
Tyler Goodlet
466e96c99b Fixup and add more details to virt docs 
`virt.hyper_info` no longer exists; switch to `virt.host_info`.
Document `virt.list` for listing all machines on all hypervisors.
Add more details regarding how images are copied to hypervisor minions
and cloned locally before configuration, seeding and boot.
 2017-03-15 02:37:03 -04:00
Tyler Goodlet
fafa94daeb Fix docs bug about VNC consoles being created by default 2017-03-15 02:37:03 -04:00
rallytime
029f28bbd5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/cmdmod.py
 2017-03-14 15:44:38 -06:00
rallytime
4b0bdc9ce0 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/s3.py
 2017-03-14 15:39:51 -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
51fb191157 Merge pull request #39841 from rafaelcaricio/telegram-beacon 
Telegram beacon
 2017-03-14 13:30:37 -06:00
Joseph Hall
dde48b3650 Add event_filter to salt cloud 2017-03-13 15:36:13 -06:00
Mike Place
af242e1c51 Merge pull request #39864 from rallytime/remove-26-requirements 
Remove the dev_python26.txt install file
 2017-03-10 20:51:24 -07:00
Mike Place
4d5adadebd Merge pull request #39966 from techhat/armcache 
Update Azure ARM cache
 2017-03-10 20:35:04 -07:00
rallytime
9ddf032e8e Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/beacons/status.py
  - salt/modules/saltutil.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_beacons.py
  - tests/unit/beacons/inotify_beacon_test.py
 2017-03-10 14:57:31 -07:00
Joseph Hall
44bb43825a Update Azure ARM cache 2017-03-10 14:15:12 -07:00
Mike Place
935652cb24 Merge pull request #39923 from cloudflare/capirca-module 
New execution module: Capirca
 2017-03-10 12:25:29 -07: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
Mike Place
eca9844cca Merge pull request #39926 from cloudflare/netacl-module 
New execution module: netacl (napalm_acl)
 2017-03-09 17:31:34 -07:00
Mike Place
27f1fffd33 Merge pull request #39927 from cloudflare/netacl-state 
Netacl state
 2017-03-09 17:29:26 -07: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
Mike Place
bdbb1f814e Merge pull request #39928 from jmickle/develop 
updating documentation for librato returner
 2017-03-09 12:46:56 -07:00
Jonathan Mickle
6b52e5a0b9 updating documentation for librato returner 2017-03-09 10:04:46 -08:00
Mircea Ulinic
fa7a6ff19b Add autodoc for netacl state 2017-03-09 17:09:27 +00:00
Mircea Ulinic
cf535d744e Add autodoc for netacl 2017-03-09 16:54:36 +00:00
David Murphy
5077c989bb Updated changes file for added AIX support 2017-03-09 09:38:35 -07:00
Mircea Ulinic
d7dbc05caa Include Capirca autodoc 2017-03-09 16:34:20 +00: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
rallytime
4fc9b5484b Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/pillar/makostack.py
  - tests/integration/client/test_runner.py
  - tests/integration/states/test_file.py
 2017-03-08 09:04:26 -07: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
da164bfc22 Minor grammar cleanup 2017-03-07 08:51:29 -07:00
Ronald van Zantvoort
7cd3ac4e78 Cache roster: add release notes 2017-03-07 12:10:34 +01:00
rallytime
2193cee012 Remove the dev_python26.txt install file 
Since we're moving to support Python 2.7 and 3.4 in Nitrogen,
we shouldn't need the 2.6 requirements file any longer.

Also updates the doc instructions to use the dev_python34 file
instead of dev_python26, depending on your Python version.
 2017-03-06 23:02:17 -07:00
Nicole Thomas
76adf65880 Merge pull request #39853 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-06 11:44:38 -07:00
rallytime
a3fe63f972 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-03-06 09:12:01 -07:00
Rafael Caricio
88589fb1f6 Add documentation for the Telegram bot 2017-03-05 16:09:47 +01: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
Mike Place
e48036a05d Merge pull request #39773 from twangboy/win_file_dacl 
Make win_file use the win_dacl salt util
 2017-03-02 09:24:50 -07:00
Mike Place
2d711782e8 Merge pull request #39736 from techhat/spmstates 
Add pre and post states to SPM
 2017-03-01 19:57:41 -07:00
twangboy
7ef41155c0 Make win_file use the win_dacl salt util 2017-03-01 17:57:23 -07:00
rallytime
65b239664e Restore ipv6 connectivity and "master: <ip>:<port>" support 2017-03-01 14:15:07 -07:00
Mike Place
2484e52716 Merge pull request #39743 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-01 11:46:47 -07:00
Joseph Hall
255db60f5a Add pre and post states to SPM 2017-03-01 10:40:30 -07:00
Mike Place
4fc0451d64 Merge pull request #39702 from techhat/spmfiles 
Add files section to FORMULA files
 2017-03-01 10:18:30 -07:00
Ch3LL
1853c998c4 add initial 2016.11.4 release notes 2017-03-01 09:47:07 -07:00
nafg
e48f22c301 Add "Edit on GitHub" link to the docs 2017-03-01 00:34:22 -05:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
rallytime
452822f5f7 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-02-28 17:14:40 -07:00
Nicole Thomas
8809d33674 Merge pull request #39701 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-28 12:50:10 -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
7cc49adef5 [develop] Bump latest release version to 2016.11.3 2017-02-28 09:03:40 -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
Erik Johnson
7b958fb389 Add options to skip fileserver/git_pillar preflight checks 
This commit also modifies the master config for the test suite to use
this new option, so that a missing GitPython/Pygit2 will not crash the
test suite's master. This should make the test suite run smoother by
only negatively impacting those tests which require the pillar data
provided by git_pillar, when a valid provider is not available.
 2017-02-27 20:21:53 -06:00
Joseph Hall
ded8040b55 Update docs 2017-02-27 17:51:00 -07:00
Mike Place
87642bc4ab Merge pull request #39691 from gtmanfred/develop 
add syncing seperate cache modules on the salt master
 2017-02-27 17:03:45 -07:00
rallytime
b4366103a6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - .pylintrc
  - .testing.pylintrc
  - salt/fileclient.py
  - salt/minion.py
  - salt/modules/docker.py
  - salt/modules/win_iis.py
  - salt/states/docker.py
  - salt/states/file.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_sysmod.py
 2017-02-27 15:11:37 -07:00
Mike Place
cbd66a0d3f Merge pull request #39676 from F30/hash-comment 
Fix comments about the "hash_type" option
 2017-02-27 13:11:40 -07:00
Daniel Wallace
88e8a1b1c6 add syncing seperate cache modules on the salt master 2017-02-27 12:15:46 -06:00
Felix Dreissig
5371bc0996 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-02-26 23:24:54 +01:00
Felix Dreissig
78a185ab11 Fix comments about file backup directory 
The actual file state backup directory is called "file_backup" without a
trailing 's'.
 2017-02-26 22:49:29 +01:00
Mike Place
e540b4616e
Update Solaris installation document 
The OpenCSW packages are no longer maintained. Include details about
installing via setup.py.
 2017-02-25 19:24:02 -07:00
Mike Place
cfeda912f6 Merge pull request #39629 from terminalmage/pr-34327 
Implement git_pillar mountpoints
 2017-02-24 16:30:32 -07:00
Erik Johnson
f6b9152a9e Add no_block feature to Nitrogen release notes 2017-02-24 15:14:09 -06:00
Erik Johnson
9a2193e8f2 Add git_pillar mountpoints feature to Nitrogen release notes 2017-02-24 10:37:28 -06:00
Erik Johnson
8277e42bc1 Add pillar-environments anchor 2017-02-23 22:14:25 -06:00
Erik Johnson
cc2984e71a Add file-roots-directory-overlay anchor 2017-02-23 22:14:25 -06:00
Erik Johnson
0838331355 Add git_pillar_includes config option 2017-02-23 22:14:24 -06:00
Erik Johnson
862a3ec309 Different default value in example for pillarenv 2017-02-23 22:14:24 -06:00
Erik Johnson
2db0f2af4d Add versionadded for pillarenv_from_saltenv 
I forgot to add this when initially implementing this feature.
 2017-02-23 22:14:24 -06:00
Pedro Algarvio
2a76618b17
Fix templates for the new test module naming scheme 2017-02-23 23:19:44 +00: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
rallytime
2595ac383d Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/docker.py
  - salt/states/docker.py
 2017-02-22 16:24:36 -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
Mike Place
b516e2968c Merge pull request #39539 from brd/doc-saltmine 
Improve the Salt Mine documentation
 2017-02-22 11:24:39 -07:00
rallytime
c46f82c029 Merge branch '2016.11' into 'develop' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
 2017-02-21 14:20:20 -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
Brad Davis
99fd63586f Better explain what we are setting in these files for new users. Also note 
where the variable server comes from.
 2017-02-21 12:34:18 -07:00
Brad Davis
f08cbd67b4 Explain what changing the mine_interval on the minion does and how to have all the minions update at will 2017-02-21 12:09:09 -07:00
Brad Davis
b8b9c633a1 Add example output for the pillar.items command 2017-02-21 11:57:23 -07:00
Brad Davis
4142b4bcd3 Show how to force the pillar refresh and verify the pillar contains what we expect 2017-02-21 11:40:12 -07:00
Brad Davis
bb622a68b2 Further explain the additional function arguments and where to find them 2017-02-21 11:39:03 -07:00
Brad Davis
1356dd6cc0 Explain where the functions available as mine_functions come from. 2017-02-21 11:37:12 -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
Mike Place
75021cdb4c Merge pull request #39406 from thatch45/parallel_states 
Parallel states
 2017-02-19 10:58:35 -07:00
Erik Johnson
c673d06f48 Rename dockerng state/execution module to docker 2017-02-18 21:58:25 -06:00
Erik Johnson
6e24dd85c4 Remove dockerio state/module (moved to salt-contrib) 2017-02-18 21:58:24 -06:00
Mike Place
deba6d2655 Merge pull request #39367 from gtmanfred/develop 
add extmod_blacklist to make it easier to remove modules
 2017-02-17 16:57:44 -07:00
Mike Place
13b254aa7b Merge pull request #39363 from cloudflare/napalm_px 
New execution module: napalm helpers
 2017-02-17 16:55:10 -07:00
Thomas S Hatch
3a78c49b61 Fix some obvious oversights 2017-02-17 16:07:52 -07:00
Mike Place
bf68f9c73c Merge pull request #39404 from Mac21/add-subnets-cloud-gce 
Add subnetwork support to GCE Cloud Module.
 2017-02-17 11:40:46 -07:00
Cory Wright
cc90d0d53f The Reactor docs should use pillar='{}' instead of 'pillar={}' 2017-02-17 11:07:39 -06:00
toller
3ab83e5d94 Fix documentation about deleting subnetwork and network when recources are using them. 2017-02-17 09:53:03 -07:00
Ionuț Ciocîrlan
ebe2c3e83b grammar in states/top.rst 2017-02-17 00:26:45 +02: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
Nicole Thomas
1577bb68af Merge pull request #39459 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-16 14:30:31 -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
Mike Place
b17931a653 Merge pull request #39455 from UtahDave/develop 
add Salt Enterprise photo
 2017-02-16 12:39:20 -07:00
rallytime
dda39d4e63 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/grains.py
  - salt/utils/gitfs.py
 2017-02-16 12:18:46 -07:00
David Boucha
570e14250d add Salt Enterprise photo 2017-02-16 11:50:28 -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
Mircea Ulinic
30995955ce Include doc 2017-02-16 16:04:40 +00:00
Mircea Ulinic
ec5a43c9e6 Add doc for the new napalm execution module 2017-02-16 16:04:40 +00:00
Sergey Kacheev
f3f129c8f1 document ~/.salt/Saltfile 2017-02-16 17:39:22 +07:00
Ari Maniatis
4af0514def Improve introduction to explain the purpose of orchestration 
Before diving into technical details tell the user why they want this feature.
 2017-02-16 18:52:05 +11:00
Jean-Claude Computing
94f349a900 Fix documentation for detach's default value 2017-02-15 20:29:29 +01:00
Daniel Wallace
d332b33c8a add extmod_blacklist to make it easier to remove modules 2017-02-15 12:47:32 -06:00
rallytime
6d78adbf08 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/tutorials/gitfs.rst
  - salt/fileserver/roots.py
  - salt/loader.py
 2017-02-15 10:35:02 -07:00
Mike Place
415102f346 Merge pull request #39411 from rallytime/fix-38762 
Update external_cache docs with other configuration options
 2017-02-15 10:30:39 -07:00
Erik Johnson
7e1803b617 Update docs on upstream EPEL7 pygit2/libgit2 issues (#39421) 
pygit2 was rebuilt, but libgit2 still needs a rebuild. I opened an
upstream bug report this morning, this updates the docs to reflect the
current status of this upstream issue.
 2017-02-15 10:10:39 -07:00
rallytime
e13febe58d Update external_cache docs with other configuration options 
There are more places than just the minion config file to define
external job cache configuration settings for minions. This change
updates the docs to include some of those other places and the
order in which they're evaluated if the settings are defined in
more than one place.

Fixes #38762
 2017-02-14 17:18:35 -07:00
Thomas S Hatch
aa6518cac7 Add docs 2017-02-14 13:51:55 -07:00
toller
2cc6ce7b51 Add subnetwork support to GCE Cloud Module. 
Implements #39258
 2017-02-14 12:48:57 -07:00
Mike Place
3ec9e043fa Merge pull request #39306 from markuskramerIgitt/writing_documentation 
rst table requires plus-signs for column
 2017-02-13 14:59:08 -07:00
William Giokas
0647dc8aab doc: Fix the Nix documentation (#39343) 2017-02-13 09:42:37 -07:00
Elias Probst
2021f5b537 Add creation/configuration of Salt PKI dirs to hacking docs (#39341) 2017-02-13 09:39:42 -07:00
Erik Johnson
fa3014393c Document the upstream RedHat bug with their pygit2 package (#39316) 
See https://github.com/saltstack/salt/issues/38630#issuecomment-274403448
 2017-02-10 16:09:35 -07:00
rallytime
c1df446b7a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/returners/postgres.py
  - salt/returners/postgres_local_cache.py
 2017-02-10 10:18:26 -07:00
rallytime
0b8dddf12b Merge branch '2015.8' into '2016.3' 
No conflicts.
 2017-02-10 08:24:51 -07:00
markuskramerIgitt
2a40840421 rst table requires + signs for column 2017-02-10 12:33:57 +01:00
markuskramerIgitt
7e25c637d9 wrong git branch 2017-02-10 12:29:13 +01:00
markuskramerIgitt
96958f4706 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-02-10 12:24:20 +01:00
markuskramerIgitt
6f165a954a rst table requires + signs for column 2017-02-10 12:20:34 +01:00