valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,002 Commits 24 Branches 182 Tags 341 MiB
d8dc8a338b
Commit Graph

7327 Commits

Author SHA1 Message Date
Mike Place
19894f68ca Merge pull request #40724 from cro/minion_key_revoke_cfg 
Minion key revoke cfg
 2017-05-02 11:18:05 -06:00
rallytime
8e4b679d5c Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/pip.py
 2017-05-01 10:45:19 -06:00
rallytime
a69cd74f75 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/nova.py
  - salt/spm/__init__.py
 2017-04-28 09:23:42 -06:00
rallytime
7f31e41aa6 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pip.py
 2017-04-28 09:20:59 -06:00
Mike Place
909d519ddb Merge pull request #40751 from rallytime/fix-39531 
Use Salt's SaltYamlSafeLoader and SafeOrderedDumper classes for yaml.load/dump
 2017-04-28 06:56:05 -06:00
Mike Place
8fdfe4ece6 Merge pull request #40935 from gtmanfred/softlayer 
Attempt to connect to public ip address in softlayer
 2017-04-28 05:43:57 -06:00
Erik Johnson
e494ae43e5 Add dockerng fixes to 2016.11.4 release notes 2017-04-27 14:07:29 -05:00
Daniel Wallace
d6eb11410f Attempt to connect to public ip address in softlayer 
Unless private_ssh or private_wds is set.

Softlayer does not require that a public_vlan be set in order to build a server
with a public ip address.  It can also be cumbersome to keep track of multiple
public_vlans which can be configured at the account level if you have multiple
accounts.

Like other cloud providers softlayer should default to connecting to the
public_vlan unless private_ssh is set to True.
 2017-04-27 12:22:13 -06:00
Erik Johnson
8c078f144c Add additional note about quoting within load_yaml 2017-04-27 11:13:01 -05:00
Erik Johnson
123b5cdc11 Add documentation for PyYAML's loading of time expressions 
Also remove the notice about the handling of integer scalars starting
with zeroes, as this was fixed in 0.10.0 which is roughly 5 years old
now.
 2017-04-27 10:59:49 -05:00
Cory Wright
2995a05c2b Make salt.auth.rest heading consistent with all other salt.auth documentation 2017-04-27 09:32:53 -04:00
rallytime
e2aa5e2f21 Add fingerprint_hash_type default value change to release notes 2017-04-26 10:47:28 -06:00
Nicole Thomas
7c10a419a1 Merge pull request #40866 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-25 16:42:11 -06:00
Mike Place
5d9dd3ad56 Merge pull request #40805 from terminalmage/moby 
Alias moby to docker in Nitrogen (and later)
 2017-04-24 22:37:53 -06:00
rallytime
5372f25fde Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/rackspace.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
 2017-04-24 15:35:28 -06:00
Ch3LL
e7b604339d
[2016.11] Bump latest release version to 2016.11.4 2017-04-24 13:29:28 -04:00
Ch3LL
889540a313
[2016.3] Bump latest release version to 2016.11.4 2017-04-24 13:27:15 -04:00
Erik Johnson
0e229a1910 Add note about moby naming to Nitrogen release notes 2017-04-23 23:34:58 -05:00
Daniel Wallace
b60a8d013a remove rackspace from index 2017-04-21 09:23:05 -06:00
Daniel Wallace
559aa1d8b6 remove deprecated firstgen rackspace cloud driver 2017-04-21 08:59:56 -06:00
rallytime
0b96d52f71 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_pkg.py
 2017-04-20 11:21:10 -06:00
Mike Place
5388ffa7a2 Merge pull request #40785 from alexproca/backport-winexec-selection 
win_pkg: backport 2016.11 add msiexec override to enable selection of 32 or 64 msiexec.exe
 2017-04-20 10:45:13 -06:00
Erik Johnson
f99259a6eb Fix inaccurate nodegroup docs 
We should probably support defining nodegroups as a "dictlist" in the
future, but we don't right now, so the docs are currently inaccurate.
 2017-04-20 10:07:19 -05:00
Alex Proca
91cafd5094 Add option to select 32 or 64 version of msiexec 
Pass path to msiexec overloading msiexec parameter
 2017-04-20 12:25:52 +03:00
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-04-18 16:42:30 -06:00
Mike Place
e700d8183b Merge pull request #40745 from cro/vmware_disk_datastore_bp 
Backport `Add support for specifying a datastore for new disks.` PR #36457
 2017-04-18 14:00:50 -06:00
rallytime
62c4d37c2f Use salt.utils.yamlloader with SaltYamlSafeLoader as the Loader with yaml.load 2017-04-18 13:41:07 -06:00
C. R. Oldham
d24078d1a0 Add docs for "datastore" param for disks 2017-04-18 09:33:46 -06:00
C. R. Oldham
500d6b281d Document validity of a datastore key inside a disk definition. 2017-04-18 09:33:46 -06:00
Mike Place
785e6060a9 Add requested docs 2017-04-18 08:34:56 -06:00
rallytime
292f55600b Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/fileserver/s3fs.py
  - tests/unit/test_fileclient.py
 2017-04-17 13:32:56 -06:00
C. R. Oldham
65ea8997b7 Add allow_minion_key_revoke config option 2017-04-17 13:20:45 -06:00
Ch3LL
d228fb6e02
Add 2016.11.4 Release Note ChangeLog 2017-04-14 17:17:03 -04:00
Nicole Thomas
ceedbf1a63 Merge pull request #40649 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-12 11:18:32 -06:00
Mike Place
4af8d08e43 Merge pull request #40581 from terminalmage/release_notes 
Make scheduled change to osmajorrrelease grain, clean up Nitrogen release notes
 2017-04-11 16:49:15 -06:00
rallytime
e90622bc22 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/dockermod.py
  - salt/modules/file.py
 2017-04-11 15:03:34 -06:00
Nicole Thomas
4beb7b4e77 Merge pull request #40644 from rallytime/nitrogen-doc-update 
Add autodoc modules for new files in nitrogen
 2017-04-11 14:59:26 -06:00
rallytime
3a232ffe8b Add autodoc modules for new files in nitrogen 2017-04-11 19:31:33 +00:00
Erik Johnson
6cf9202bc8 Fix more formatting issues in nitrogen release notes 
The wildcard versions docs should be grouped under the same top-level
bullet. Also, there was a stray execution module change that seems to
have tried to flee south. I have returned it to it's natural habitat.
 2017-04-11 11:02:58 -05:00
Erik Johnson
c36c9465e6 Formatting fixes for the module.run changes 
This fixes the RST formatting so that it renders properly in the
bulleted list format. It also makes some changes to the wording for
clarification purposes.
 2017-04-11 11:02:58 -05:00
Erik Johnson
3bbebd7d82 os_release -> osmajorrelease 
This is a typo fix
 2017-04-11 11:02:58 -05:00
Daniel Wallace
a86b101ae6 add retries on authentications of the salt minion reconnecting 2017-04-10 14:53:26 -06:00
rallytime
2cd0c5e4ec Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
  - tests/unit/modules/test_pillar.py
 2017-04-10 14:09:25 -06:00
Erik Johnson
f8bc423ef9 Merge pull request #40563 from terminalmage/merge-2016.3-2016.11 
Merge-forward 2016.3 -> 2016.11
 2017-04-07 10:08:19 -05:00
Joseph Hall
08d071bc68 Update Azure ARM docs 2017-04-06 09:43:19 -06:00
Erik Johnson
a6d68f50fe Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11 2017-04-06 10:15:47 -05:00
Nicole Thomas
4d7871e4d7 Merge pull request #40494 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-04-05 14:15:05 -06:00
rallytime
71f3c73150 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/template.py
  - salt/utils/pycrypto.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_artifactory.py
  - tests/unit/test_template.py
 2017-04-05 13:02:14 -06:00
Mike Place
28fc048030 Merge pull request #40464 from terminalmage/userdata-renderer 
salt-cloud: Do not pass userdata_file through yaml renderer
 2017-04-05 11:32:06 -06:00
Mike Place
ee5f891002 Merge pull request #40523 from s0undt3ch/features/py3 
[WIP] A Little House Keeping and Addressing Py3 test suite leakage
 2017-04-05 10:58:32 -06:00
Nicole Thomas
990bde4c07 Merge pull request #40530 from dmurphy18/aix_docupd 
Update release information for 2016.11.4 for additional AIX support
 2017-04-05 10:20:22 -06:00
Pedro Algarvio
c98920c5fb Merge pull request #40535 from tonybaloney/doc_fix 
Update hacking.rst
 2017-04-05 09:34:39 +01:00
Anthony Shaw
97044bd998 Update hacking.rst 
this one is wrong too
 2017-04-05 15:12:08 +10:00
Anthony Shaw
25ec20ebb0 Update hacking.rst 
Small error in the instructions
 2017-04-05 15:08:40 +10:00
Erik Johnson
73f4c43e2a Allow for userdata_template to be disabled in a cloud_profile 
This handles the case where a global value has been set and it is
necessary to disable it for a single profile.
 2017-04-04 15:41:43 -05:00
Erik Johnson
b440d0c679 Update 2016.11.4 release notes for userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
b580654f85 Update cloud docs to reflect userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
a6064fb2e4 Rename userdata_renderer -> userdata_template in master config docs 2017-04-04 15:41:43 -05:00
Erik Johnson
eddbd41265 Openstack did not have templating support for userdata_file before 2016.11.4 2017-04-04 15:41:43 -05:00
Erik Johnson
a85a416c72 Add userdata_renderer fix info to 2016.11.4 release notes 2017-04-04 15:41:43 -05:00
Erik Johnson
111188742a Add documentation for userdata_renderer 2017-04-04 15:40:50 -05:00
David Murphy
fd93caf206 Added further support for functionality on AIX for 2016.11.4 2017-04-04 13:57:37 -06:00
Mike Place
7a04ed2439 Merge pull request #40497 from DSRCorporation/features/39275_memcache 
Memcache documentation and minor updates.
 2017-04-04 13:55:17 -06:00
David Murphy
17b58917f2 Update release information for new AIX support 2017-04-04 13:51:14 -06:00
Mike Place
fe9bc95b26 Merge pull request #40513 from terminalmage/fileserver-design-docs 
Add initial developer docs on the fileserver and client
 2017-04-04 13:37:35 -06:00
Erik Johnson
906d02f395 Add a section on updating the fileserver 2017-04-04 13:06:45 -05:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration 2017-04-04 18:58:19 +01:00
rallytime
8e480fffb5 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-04-04 11:15:41 -06:00
Pedro Algarvio
785698d2ce
Import for the original module 2017-04-04 18:04:38 +01:00
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
Erik Johnson
4e3a2d066a Add a section on the cp module 2017-04-04 10:00:52 -05:00
Denis Fondras
a58e320f41 Set True instead of 1 2017-04-04 14:50:03 +02:00
Erik Johnson
85b9bb4072 Fix label for RST link 2017-04-04 00:28:12 -05:00
Erik Johnson
6329d3580a Add initial developer docs on the fileserver and client 
This may be expanded, but this gives a brief overview.
 2017-04-03 23:56:08 -05: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
f6803bbd6c Merge pull request #40475 from cloudflare/yang-state 
New state module: NAPALM YANG
 2017-04-03 16:30:54 -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
Daniel Wallace
6e2f9080ca update docs for logging handlers 2017-04-03 16:04:53 -05:00
Thomas S Hatch
6279f7c120 fix do to pre correct on python randome function 2017-04-03 14:50:07 -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
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