Pedro Algarvio
8031ac0209
Move mixins to tests.support.mixins.
...
The adapted config mixin get config methods are not static methods
2017-04-04 17:29:34 +01:00
Denis Fondras
a58e320f41
Set True instead of 1
2017-04-04 14:50:03 +02:00
Mike Place
30f2593408
Merge pull request #40478 from cloudflare/add-new-funs
...
Add new functions to the net module
2017-04-03 16:31:24 -06:00
Mike Place
ae43cb69e9
Merge pull request #40458 from cloudflare/napalm-syslog
...
New engine: Napalm syslog
2017-04-03 16:27:10 -06:00
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
Mircea Ulinic
a0d93e0021
Merge branch 'develop' into add-new-funs
2017-04-03 22:11:26 +03:00
Mircea Ulinic
f7e5473a23
Insert new funs into Nitrogen release notes
2017-04-02 11:05:35 +00:00
Mircea Ulinic
0e03c9ba14
Add nitrogen release note for napalm-yang
2017-04-01 02:48:09 +00: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
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
rallytime
d5576d75e7
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/crypt.py
2017-03-30 12:21:44 -06: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
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
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
b6032215e9
Merge pull request #40299 from amendlik/saltify-authtest
...
Saltify authtest
2017-03-28 10:17:02 -06: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
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
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
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
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
Dmitry Kuzmenko
f3a970eec1
Added release notes.
2017-03-22 19:15:21 +03:00