saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
65316 commits 34 branches 292 tags 803 MiB
Commit graph

65316 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergey Kizunov
afca3d6733 Added Windows master related scripts 
Added the following scripts to Windows installations:
- salt
- salt-key
- salt-master
- salt-run

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-02-05 15:08:01 -06:00
Mike Place
f6adcf8c36 Merge pull request #30901 from DSRCompany/features/28154_denied_keys 
Features/28154 denied keys
 2016-02-05 10:01:08 -07:00
Mike Place
9bb8490148 Merge pull request #30926 from ketzacoatl/consul-ext-pillar-role-grain 
update consul ext_pillar to support root based on role
 2016-02-05 08:58:35 -07:00
Mike Place
61306b0311 Merge pull request #30927 from ketzacoatl/consul-ext-pillar-update-list-format 
update key formatting/handling in consul ext_pillar
 2016-02-05 08:57:51 -07:00
ketzacoatl
c4e83e819f update key formatting/handling in consul ext_pillar 
If the value of the key we've looked up is in the form:

- foo
- bar

treat it as a list, and drop the '- ', otherwise, leave it be.
 2016-02-05 02:48:24 -05:00
ketzacoatl
2116c3ae9c update consul ext_pillar to support root based on role 
If there is a "role" grain, provide that as an option to
format the path prefix.
 2016-02-05 02:38:32 -05:00
jacobhammons
147de1ac54 Merge pull request #30921 from jacobhammons/dev-rel-notes 
Updated latest release to 2015.8.5, added a partial list of new modul…
 2016-02-04 18:17:39 -07:00
Jacob Hammons
61ad242a89 Updated latest release to 2015.8.5, added a partial list of new modules and features to boron release notes 2016-02-04 18:16:01 -07:00
Mike Place
5e127b04c1 Merge pull request #30911 from khorben/khorben/status-diskusage-netbsd 
Avoid a crash in "status.diskusage" when not on Linux or FreeBSD
 2016-02-04 16:51:00 -07:00
Mike Place
fff8ad3757 Merge pull request #30907 from cachedout/fixup_30718 
Fixup 30718
 2016-02-04 16:45:30 -07:00
Pierre Pronchery
63e0b51997 Avoid a crash in "status.diskusage" when not on Linux or FreeBSD 2016-02-04 23:19:40 +01:00
Mike Place
e3c248786e Merge pull request #30897 from mtorromeo/cloudlinux-grains-fix 
Only remove the word linux from distroname when its not part of the name
 2016-02-04 14:39:24 -07:00
Mike Place
e31a4c1f53 Lint 2016-02-04 14:33:45 -07:00
scottjpack
1d72ca1df3 Fixing lint errors 2016-02-04 14:19:32 -07:00
scottjpack
0d94e78f66 Fixing lint formatting issues 2016-02-04 14:19:32 -07:00
scottjpack
2187d2cffa Adding splunk returner 2016-02-04 14:19:32 -07:00
Mike Place
911cb0a856 Merge pull request #30879 from rhansen/docker-dont-remove-volume-if-driver-differs 
Don't delete a Docker volume if the volume's driver differs
 2016-02-04 14:04:44 -07:00
Mike Place
d340b5b8b0 Merge pull request #30883 from cachedout/fix_30601 
Fix 30601
 2016-02-04 13:58:53 -07:00
Mike Place
141bff30de Merge pull request #30902 from sjorge/module-nictagadm 
nictagadm module
 2016-02-04 13:50:17 -07:00
Mike Place
44850f0faf Merge pull request #30903 from pakdel/centos_pegged_version 
Major version pegged packages support for CentOS
 2016-02-04 13:49:10 -07:00
Amir Pakdel
14b60c7066 Major version pegged packages support for CentOS 2016-02-04 13:41:41 -05:00
Jorge Schrauwen
2b72ef991d finish nictagadm module 2016-02-04 16:53:57 +00:00
Jorge Schrauwen
7a1f6c3cb4 implement nictagadm.vms 2016-02-04 16:19:00 +00:00
Dmitry Kuzmenko
4076e18740 Normalize help outpu: capital letters and dots in sentenses. 2016-02-04 19:13:07 +03:00
Dmitry Kuzmenko
77b7364ade Handle denied keys with -a/-r --include-denied. 
Also:
1. Added --include-(accepted|rejected) instead of confusing
--include-all
2. Depreceate confusing --include-all
 2016-02-04 19:13:07 +03:00
Massimiliano Torromeo
378e54638d Only remove the word linux from distroname when its not part of the name 
This will now still replace "CentOS Linux" with "CentOS" while leaving "CloudLinux" unmodified.
Fixes #28951
 2016-02-04 13:47:59 +01:00
Richard Hansen
6b5b2c063d change default for volume_present()'s force parameter to False 
This is safer, as it avoids surprising the user with permanent data
loss.
 2016-02-03 22:32:20 -05:00
Richard Hansen
255f5a1b91 add 'force' to replace (or not) volumes with driver mismatch 
Add a new 'force' option that will cause volume_present() to delete
and re-create a volume if the existing volume's driver doesn't match
the specified driver.  Set the default to True to preserve existing
behavior.
 2016-02-03 19:32:13 -05:00
Richard Hansen
6387418ea5 typo fixes 2016-02-03 19:31:29 -05:00
Mike Place
4f8264e28c Fix failing test 2016-02-03 16:53:22 -07:00
Mike Place
0e8f1a15b4 Merge pull request #30777 from abednarik/fix_update_apt_hold_pkgs 
Fix update apt hold pkgs
 2016-02-03 16:38:26 -07:00
Mike Place
b1381001f0 Merge pull request #30875 from cachedout/fix_kwarg_order_supervisord 
Reorder args.
 2016-02-03 16:10:00 -07:00
Mike Place
6f95752cf3 Merge pull request #30870 from skizunov/develop2 
Fix TCP transport PUB auth on failover with master restart
 2016-02-03 16:02:08 -07:00
Mike Place
7ec8ba2de5 Merge pull request #30878 from alxf/local/issue-#26639 
Issue #26639: Implement the --config-dump option.
 2016-02-03 15:52:16 -07:00
Mike Place
b6d952cff6 Merge pull request #30880 from jfindlay/VMware 
VMWare -> VMware
 2016-02-03 15:50:58 -07:00
abednarik
d511dda90a Allow update hold packages in apt. 
The goal here is to allow updating hold packages, even when hold is set to True.

Fixes #30733.
 2016-02-03 19:31:50 -03:00
Thomas S Hatch
03a890429f Merge pull request #30876 from cachedout/fixup_30830 
Fixup 30830
 2016-02-03 14:59:30 -07:00
Justin Findlay
b41850d9ed add release note about VMWare -> VMware 2016-02-03 14:54:11 -07:00
Justin Findlay
8a1b64c5f7 grains.core: VMWare -> VMware 
Fixes #30807. `VMware <https://vmware.com/>`_ uses VMware, so so should
we.  We also shouldn't be mixing grains between VMWare and VMware.
 2016-02-03 14:27:28 -07:00
Justin Findlay
4b44412519 cloud, proxy, utils: VMWare -> VMware 2016-02-03 14:27:28 -07:00
Justin Findlay
543f0ca712 doc, conf, pkg: VMWare -> VMware 2016-02-03 14:27:28 -07:00
alxf
5594e16aed Issue #26639: Implement the --config-dump option. 2016-02-03 21:57:14 +01:00
Mike Place
60e051dbcd Lint 2016-02-03 13:22:54 -07:00
Mike Place
a6f81d6f5b Reorder args. 
Refs #30772
 2016-02-03 12:59:30 -07:00
Mike Place
629c0b2829 Merge pull request #30772 from HerrBerg/develop 
supervisord: allow updating single process groups
 2016-02-03 12:58:13 -07:00
Mike Place
a52fde5a20 Merge pull request #30871 from ChrisLundquist/update-cmd-env-docs 
[states/cmd.py] update docs on passing env to run
 2016-02-03 12:55:32 -07:00
Mike Place
618f823e21 Merge pull request #30774 from Unity-Technologies/feature/mac_package 
Added ability to install PKG, DMG and APP files for OS X minions
 2016-02-03 12:54:32 -07:00
Jorge Schrauwen
447bca0748 implemented nictagadm.add 2016-02-03 19:38:36 +00:00
Chris Lundquist
ac3f1f326e [states/cmd.py] update docs on passing env to run 
In Salt: 2015.8.3 it seems there is a simpler way to pass
environmental variables to cmd.run. This updates the documentation
to reflect a more straight forward way.
 2016-02-03 11:31:28 -08:00
Sergey Kizunov
dbd0ef688a Fix TCP transport PUB auth on failover with master restart 
If the salt-master restarts, and the salt-minion is using the TCP
transport on failover mode, the salt-master will reject the
salt-minion's pre-existing auth token.

This fix will reset the auth when handling the `__master_disconnected`
event in minion.py.

Note: A possible alternative to this fix is to have the master respond
to the minion during the PUB channel identification process. If the
response is that the authentication failed, the minion would then try
to re-authenticate at that time. Currently, the master does not
respond to the minion's identification token.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-02-03 13:30:50 -06:00