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
81,182 Commits 24 Branches 182 Tags 341 MiB
48d2575f77
Commit Graph

7248 Commits

Author SHA1 Message Date
Erik Johnson
0088a850bc Merge pull request #40284 from The-Loeki/cache-roster2 
cache roster: Add SDB support, improve documentation
 2017-04-03 15:21:01 -05:00
Thomas S Hatch
66b9515af7 Fix up the doc for failover clarity 2017-04-03 13:24:56 -06:00
Mircea Ulinic
a0d93e0021 Merge branch 'develop' into add-new-funs 2017-04-03 22:11:26 +03:00
Dmitry Kuzmenko
82c45b1a52 Memcache documentation and minor updates. 2017-04-03 19:51:50 +03:00
rallytime
8111909bb1 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/master_tops/index.rst
  - salt/runners/saltutil.py
 2017-04-03 10:41:01 -06:00
Mircea Ulinic
f7e5473a23 Insert new funs into Nitrogen release notes 2017-04-02 11:05:35 +00:00
Mircea Ulinic
66d99b520c Index netyang state 2017-04-01 19:06:35 +00:00
Mircea Ulinic
24cdabd3d4 Netyang autodoc 2017-04-01 18:07:08 +00:00
Mircea Ulinic
0e03c9ba14 Add nitrogen release note for napalm-yang 2017-04-01 02:48:09 +00:00
Mircea Ulinic
b878fe867a napalm_yang module autodoc 2017-04-01 02:48:02 +00:00
Mike Place
bda781d8f9 Grammar fix 2017-03-31 14:02:48 -06:00
rallytime
2d73fca4d0 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/win_dsc.py
  - salt/modules/win_psget.py
  - tests/unit/utils/vmware_test/test_cluster.py
  - tests/unit/utils/vmware_test/test_common.py
  - tests/unit/utils/vmware_test/test_connection.py
  - tests/unit/utils/vmware_test/test_datacenter.py
  - tests/unit/utils/vmware_test/test_host.py
 2017-03-31 10:09:56 -06:00
Mircea Ulinic
9974c18f8a Add napalm_syslog note into Nitrogen release 2017-03-31 16:08:32 +00:00
Mircea Ulinic
01f18ab611 Correct Nitrogen release notes typo 2017-03-31 16:04:10 +00:00
Mircea Ulinic
11f090fec9 Add napalm_syslog autodoc 2017-03-31 16:03:16 +00:00
Mike Place
1e47120cbb Merge pull request #40381 from terminalmage/issue40355 
Support defining nodegroups as a dictlist as well as a dict
 2017-03-30 16:31:12 -06:00
Nicole Thomas
fbbe0127f5 Merge pull request #40432 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-30 15:57:57 -06:00
Mike Place
b62c8c2965 Merge pull request #40414 from chaseadamsio/develop 
docs: fix typo in states/index.rst
 2017-03-30 15:00:38 -06:00
Lukas Raska
24cc9b2a0c [WIP] Refactor Elasticsearch execution and state modules (#40192) 
* Add Ingest pipeline methods to Elasticsearch execution module

* Refactor Elasticsearch execution module and properly handle exceptions

* Throw CommandExecutionError in methods applicable for different Elasticsearch versions

* Refactor Elasticsearch states to reflect execution module changes

* Add state for managing Elasticsearch pipelines

* Fix few typos in Elasticsearch module, return None when deleted document doesn't exist

* Implements stats and health methods for Elasticsearch

* Add Elasticsearch methods to open/close index, manage search templates and repositories

* Merge existing Elasticsearch states into single one, add Search Template handling

* Add index alias state for Elasticsearch, fix documentation

* Catch all global exceptions in Elasticsearch states, unit test all of them

* Implement few Unit tests for Elasticsearch execution module, merge fixes into deprecated elastic states

* Implement additional unit tests for Elasticsearch execution module

* Finalize Elasticsearch module documentation
 2017-03-30 13:22:58 -06:00
rallytime
1792acedc0 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/template.py
  - tests/unit/modules/dockerng_test.py
 2017-03-30 12:32:24 -06:00
rallytime
d5576d75e7 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/crypt.py
 2017-03-30 12:21:44 -06:00
Erik Johnson
0d7b0c4ef0 Improve the master_tops documentation 2017-03-30 11:56:15 -05:00
Chase Adams
f2d855bfbf docs: fix typo in states/index.rst 2017-03-30 04:41:04 -07:00
Chase Adams
b9982e3884 docs: fix typo in states/index.rst 2017-03-30 04:29:31 -07:00
Nicole Thomas
48986ca16f Merge pull request #40393 from holmboe/saltssh-ubuntu1604-python2-docfix 
Document how to install Python 2 on an Ubuntu 16.04 host with salt-ssh
 2017-03-29 16:50:14 -06:00
Roald Nefs
21f161fecc fix Ubuntu notation in docs/faq.rst 
Fixed Ubuntu notation in docs/faq.rst: changed Ununtu to Ubuntu.
 2017-03-29 20:09:55 +02:00
Henrik Holmboe
311f9c86ee Document how to install Python 2 on an Ubuntu 16.04 host with salt-ssh 2017-03-29 17:47:03 +02:00
Ch3LL
f532ec5288 initial 2016.3.7 release notes 2017-03-29 09:34:03 -06:00
Erik Johnson
c7817d1e00 Support defining nodegroups as a dictlist as well as a dict 
Much of salt uses these "dictlist" structures, because it looks pretty
when rendered as YAML. This adds this support to nodegroups as well.
 2017-03-29 00:43:58 -05:00
rallytime
52edbffc85 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/cache/all/index.rst
  - doc/topics/cache/index.rst
  - salt/cache/localfs.py
  - salt/modules/boto_rds.py
  - salt/roster/cloud.py
  - salt/states/virtualenv_mod.py
  - tests/integration/states/test_archive.py
  - tests/unit/modules/test_dockermod.py
  - tests/unit/states/dockerng_test.py
 2017-03-28 17:09:30 -06:00
Pedro Algarvio
9322630126 Merge pull request #40138 from s0undt3ch/features/py3 
Fix unit tests mocking
 2017-03-28 22:34:32 +01:00
Ch3LL
7597d96edb [2016.11] Bump previous version to 2016.3.6 2017-03-28 12:39:45 -06:00
Ch3LL
a02fa7dd1f [2016.3] Bump previous version to 2016.3.6 2017-03-28 12:38:45 -06:00
Ch3LL
474c62328b Bump previous version to 2016.3.6 2017-03-28 12:37:13 -06:00
Pedro Algarvio
5df3054f47
Add minimal documentation about LoaderModuleMockMixin 2017-03-28 19:04:05 +01:00
Pedro Algarvio
7dc11df8ef
Update existing tests documentation. 2017-03-28 19:04:05 +01:00
Mike Place
d7e745a53a Merge pull request #40281 from terminalmage/rename-docker 
Rename docker execution module to avoid shadowing in the loader
 2017-03-28 11:06:08 -06:00
Mike Place
08d18152ba Merge pull request #40358 from mirceaulinic/patch-7 
Add conf_proxy cross reference
 2017-03-28 11:05:24 -06:00
Mike Place
b6032215e9 Merge pull request #40299 from amendlik/saltify-authtest 
Saltify authtest
 2017-03-28 10:17:02 -06:00
Erik Johnson
774a3f1147 Rename docker execution module to avoid shadowing in the loader 
With the merging of #39996, salt/modules/docker.py now imports
salt.utils.docker. However, our loader appends the module dir (in
this case salt/modules/) to sys.path temporarily for the length of the
loading process. So, as the docker execution module tries to import
salt.utils.docker, when salt.utils.docker attempts to do an "import
docker", and docker-py is *not* installed, this results in
salt/modules/docker.py (the docker execution module) being loaded in its
place, which results in tracebacks in the minion log.

Renaming the docker execution module keeps this import shadowing from
occurring. Note that we don't need to do this for the placeholder
salt/states/docker.py as it does not import salt.utils.docker.
 2017-03-28 10:50:47 -05:00
Mircea Ulinic
240178d241 Add conf_proxy cross reference 2017-03-28 18:24:02 +03:00
Nicole Thomas
863a9b96fb Merge pull request #40302 from cloudflare/nitorgen-doc 
Add NAPALM section in Nitrogen release notes
 2017-03-27 20:45:46 -06:00
Adam Mendlik
f1c5991971 Add documentation for saltify credential verification mode 2017-03-27 18:41:38 -06:00
Mike Place
3ee5894b9c Merge pull request #40292 from tgoodlet/qcow_docs 
Document qcow support
 2017-03-27 17:27:14 -06:00
Mike Place
338148de2c Cleaned up language slightly 2017-03-27 17:26:58 -06:00
Mike Place
15808b083f Tiny grammar fix 2017-03-27 17:25:31 -06:00
Mike Place
02cc480a2a Merge pull request #40330 from techhat/mapdata 
Pass in direct map_data instead of path to map
 2017-03-27 17:12:49 -06:00
Nicole Thomas
284d3be943 Merge pull request #40304 from vquiering/logstash_engine_add_protocol 
Add ip protocol to logstash engine
 2017-03-27 08:51:29 -06:00
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