valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
94,009 Commits 24 Branches 182 Tags 341 MiB
969296ecbe
Commit Graph

5241 Commits

Author SHA1 Message Date
rallytime
969296ecbe
Merge branch '2018.3' into 'develop' 
No conflicts.
 2018-05-15 12:38:01 -04:00
Nicole Thomas
c68f5b49fa
Merge pull request #47566 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-05-10 18:03:58 -04:00
Nicole Thomas
9836a7e62b
Merge pull request #47564 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-10 15:13:35 -04:00
rallytime
ca927fc14b
Add extra lines that are needed for proper code-block formatting 2018-05-09 16:10:31 -04:00
Nicole Thomas
ffe507d6aa
Merge pull request #47421 from bloomberg/nodegroup-topfile 
make pillar top_matches work with node groups
 2018-05-09 14:23:19 -04:00
rallytime
cf58ae22bf
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/states/pip_state.py
  - tests/unit/utils/test_stringutils.py
 2018-05-09 11:40:54 -04:00
rallytime
25f03ae425
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_status.py
  - tests/integration/states/test_pip_state.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-05-09 11:24:02 -04:00
Erik Johnson
806ffb298a
Add masterless mode docs to gitfs tutorial 2018-05-08 13:46:47 -05:00
Matt Phillips
f1dbb5694f update docs to reference new feature 2018-05-08 09:42:23 -04:00
rallytime
53d2851826
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - salt/pillar/pillar_ldap.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2018-05-07 14:13:34 -04:00
rallytime
786076ac03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/cmdmod.py
  - salt/modules/pip.py
  - salt/modules/win_lgpo.py
  - salt/states/pip_state.py
  - tests/integration/states/test_pip.py
  - tests/support/helpers.py
  - tests/unit/modules/test_pip.py
  - tests/whitelist.txt
 2018-05-07 13:17:01 -04:00
Daniel Wozniak
439806b2bb
Merge branch 'develop' into pypsexec 2018-05-04 09:57:44 -07:00
Nicole Thomas
47e994c672
Merge pull request #47437 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-05-03 16:05:06 -04:00
Ch3LL
6a261e5e3a
Add In Progress Warning for 2018.3.1 Release Notes 2018-05-03 12:47:30 -04:00
Ch3LL
b6d0cc2ab7
Add In Progress Warning for 2017.7.6 Release Notes 2018-05-03 12:06:15 -04:00
Johan Ryberg
11856adea2
Changed to cloud_provider 
Changed incorrect parameter provider to cloud_provider
 2018-05-03 10:20:37 +02:00
rallytime
bd184a257f
Merge branch '2018.3' into 'develop' 
Conflicts:
  - tests/unit/grains/test_core.py
 2018-05-02 15:28:21 -04:00
Tanoti
c9a4382e02 Enable passing test=False as kwarg from orchestration file to minion in permanent test mode 2018-05-02 09:09:35 +00:00
Nicole Thomas
63baf4c4f8
Merge pull request #47417 from gtmanfred/slack 
revert instantiating a Caller Client in the engine
 2018-05-01 14:58:06 -04:00
Nicole Thomas
0bdfaa5ffe
Merge pull request #47368 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-01 14:56:19 -04:00
Daniel Wallace
ee8a5eeb10
revert instantiating a Caller Client in the engine 
This Caller client prevents running the salt master as a non root user.  Also,
master processes are not assigned pillars so it is using whatever minion get
instantiated on the master from a caller client.

Instead, to use pillars, the engine should be started on in a minion process.
 2018-05-01 09:51:34 -05:00
rallytime
5a071c5ddf
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
 2018-04-30 16:33:13 -04:00
Daniel A. Wozniak
0816668975
clean up mis-spellings 2018-04-30 08:52:49 -07:00
esell
b2725f9858
add allocate_public_ip to docs 2018-04-30 09:29:51 -06:00
rallytime
3b40cdad2a
Add 2018.3.1 Release Notes 2018-04-30 09:35:46 -04:00
Daniel A. Wozniak
86e25cf4f1
Add support for pypsexec and smbprotocol 
- Removes the need for winexe which is not packaged for all platforms we
  support. The replacement, pypsexec, is pure python so it will work
  everywhere.
- Add support for smbprotocol to be used instead of impacket.
  smbprotocol supports python 3 and is also used by pypsexec.
 2018-04-29 00:36:27 -07:00
rallytime
13e8124031
Merge branch '2017.7' into '2018.3' 
Due to the many merge conflicts created from #47106 against the 2017.7 branch
and #46002 against the 2018.3 branch, the changes from #47106 have been largely
removed from this merge forward and the HEAD of 2018.3 was taken.

A separate fix for Tornado 5.0 support will need to be made directly against the
2018.3 branch.

Conflicts:
  - doc/topics/development/conventions/formulas.rst
  - salt/master.py
  - salt/minion.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/zfs.py
  - salt/transport/ipc.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/async.py
  - tests/support/helpers.py
  - tests/support/parser/cover.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_ssh.py
  - tests/unit/test_minion.py
  - tests/unit/utils/test_safe_walk.py
 2018-04-27 13:38:35 -04:00
Daniel Wallace
6214ed8133
add mention of the formulas channel to the formulas docs 2018-04-27 08:45:10 -05:00
Erik Johnson
dd4b0de0e0
Add release notes for dropping of virtual package support 2018-04-26 23:21:36 -05:00
Brandon Kurtz
12ac26086e
fixing typo 2018-04-26 13:12:13 -04:00
Mike Place
33c0644ac4
Credit Frank Spierings 2018-04-26 11:29:51 -05:00
rallytime
9aeb5e78f2
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/zfs.py
  - salt/modules/zpool.py
  - salt/states/zfs.py
  - salt/states/zpool.py
  - salt/utils/vault.py
  - salt/utils/zfs.py
  - tests/unit/utils/test_zfs.py
 2018-04-25 14:50:36 -04:00
Banio Carpenter
b97c9df5f3 added clarity on how to figure out what is the oldest supported main release branch 2018-04-25 10:59:22 -05:00
Nicole Thomas
29e683bea6
Merge pull request #47243 from cbosdo/libvirt_engine_autoconnect 
virt connection improvements
 2018-04-25 09:59:24 -04:00
Scott Page
01980b4c43
Fix topics/releases/2018.3.0.rst to include correct example of proxy_example beacon yaml configuration. 2018-04-25 10:12:00 +09:00
Scott Page
9682e26eec
Fix topics/proxyminion/beacon.rst to include correct example of salt_proxy beacon yaml configuration. 2018-04-25 10:10:21 +09:00
Cedric Bosdonnat
09e1d7fab4
Merge branch 'develop' into libvirt_engine_autoconnect 2018-04-24 08:52:39 +02:00
Amel Ajdinovic
615866032b Added create block storage support. 
Added ssh key support.

Added documentation
 2018-04-23 23:16:36 +02:00
Nicole Thomas
15895c4ff8
Merge pull request #47214 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-04-23 17:05:29 -04:00
Ch3LL
fa4c2e6575
Update Docs to remove unnecessary + sign 2018-04-23 15:35:04 -04:00
Ch3LL
24dea24b7e
Add CVE number to 2016.3.6 Release 2018-04-23 15:03:48 -04:00
Cédric Bosdonnat
3d3ed786cd
virt module: actually deprecate virt.nic option 
virt.nic is considered as the old version of virt:nic in the code, but
there is no warning of this. The documentation is also still mentioning
virt.nic. Updating it all to move to virt:nic
 2018-04-23 15:21:19 +02:00
Cédric Bosdonnat
6858c9931a
virt module: move virt.images to virt:images 
To continue the virt module options harmonization, deprecate virt.images
in favor of virt:images and add documentation on this option.
 2018-04-23 15:21:17 +02:00
Cédric Bosdonnat
20048c6fca
virt module: convert virt.tunnel into virt:tunnel 
To continue the virt module options harmonization, deprecate virt.tunnel
in favor of virt:tunnel and add documentation on this option.
 2018-04-23 15:21:16 +02:00
rallytime
0eab957281
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/states/test_file.py
  - tests/integration/states/test_git.py
  - tests/unit/modules/test_tls.py
 2018-04-20 15:40:49 -04:00
Alex Zeleznikov
969a2502f4 Add gitfs support for Thorium 
Allow thorium to use gitfs with a mountpoint or saltenv.
Fixes #47119
 2018-04-19 21:23:53 +03:00
Nicole Thomas
99debdd1cb
Merge pull request #47111 from terminalmage/default-renderer 
Update default renderer to jinja|yaml, improve renderer docs
 2018-04-17 16:47:33 -04:00
rallytime
abe2309c91
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
 2018-04-17 11:50:01 -04:00
rallytime
94c2a12be6
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_state.py
  - tests/unit/templates/test_jinja.py
  - tests/unit/test_minion.py
 2018-04-17 10:54:42 -04:00
Erik Johnson
7070a3be48
Update default renderer to jinja|yaml, improve renderer docs 
`yaml_jinja` and all legacy renderer syntax has been transparently
translated to the render pipeline syntax (e.g `jinja|yaml`)
under-the-hood for several years now, this just makes the default
renderer adhere to the render pipeline syntax.

It also makes significant improvements to the renderer documentation.
 2018-04-16 22:35:23 -05:00