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
85,961 Commits 24 Branches 182 Tags 341 MiB
0d06da6944
Commit Graph

85961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel A. Wozniak
4aea7ca571
Update doc string 2018-05-07 14:41:20 -07:00
Daniel A. Wozniak
b3289e5a1c
Fix test file name 2018-05-07 14:40:15 -07:00
Daniel A. Wozniak
2605ff8712
Gracefully handle blank lines in whitelist.txt 2018-05-07 13:35:00 -07:00
rallytime
48ecb78dec [2017.7.6] Update man pages 2018-05-07 20:31:38 +00:00
Nicole Thomas
e608ea9617
Merge pull request #47517 from rallytime/bp-47505-2017.7.6 
Back-port #47505 to 2017.7.6
 2018-05-07 15:42:37 -04:00
Nicole Thomas
e9c1723175
Merge pull request #47408 from Ch3LL/skip_diskusage 
Skip status.diskusage integration tests on macsox
 2018-05-07 15:06:56 -04:00
Nicole Thomas
2f50ff7bc8
Merge pull request #47480 from baniobloom/ConflictingDomainExists 
added handling for the aws error ConflictingDomainExists
 2018-05-07 15:05:27 -04:00
Daniel A. Wozniak
0734578533
Raise proper invocation errors 2018-05-07 13:59:17 -04:00
Mike Place
068da8ad7d
Merge branch '2017.7' into skip_diskusage 2018-05-07 09:20:38 -05:00
Mike Place
7f53be6e92
Merge pull request #47444 from terminalmage/render_state-spurious-error 
Skip trying to render a template for a nonexistant SLS file
 2018-05-07 08:48:23 -05:00
Daniel Wallace
1a87e7455f
allow pulling the mysql_query.run_file to pull from the fileserver 2018-05-07 08:32:32 -05:00
Mike Place
50b9c4d79d
Merge pull request #47478 from terminalmage/rename-pip-state-test 
Rename pip state test modules to match naming convention
 2018-05-07 08:13:12 -05:00
Mike Place
e78ac0f9b7
Merge pull request #47505 from dwoz/win_dsc_fixes 
Raise proper invocation errors
 2018-05-07 08:05:22 -05:00
Daniel A. Wozniak
d1fcb40d1c
Raise proper invocation errors 2018-05-06 14:58:46 -07:00
Daniel Wallace
0d4d5047d8
Merge pull request #47499 from dwoz/win_run_timeout_again 
Move kill process tree and re-use it
 2018-05-06 15:54:21 -05:00
Daniel A Wozniak
c6697b9f16
Move kill process tree and re-use it 2018-05-06 09:44:55 -07:00
Daniel Wozniak
6a4d0380b1
Merge pull request #47493 from dwoz/win_run_timeout 
Add support for windows timeout to run_salt
 2018-05-05 22:34:30 -07:00
Daniel A Wozniak
fec1233dc4
Add support for windows timeout to run_salt 
The run_salt function needs to support timeout on windows for the full
test suite to run.
 2018-05-05 15:10:14 -07:00
Banio Carpenter
d22ed7dffa added handling for the aws error ConflictingDomainExists 2018-05-04 15:11:56 -05:00
Erik Johnson
9f7a9ebebd
Rename pip state test modules to match naming convention 
This makes the naming match the naming convention used throughout the
test suite and will make the changes in
https://github.com/saltstack/salt/pull/47337 work better.
 2018-05-04 15:03:44 -05:00
Daniel Wallace
611ca1fc03
Merge pull request #47476 from gtmanfred/2017.7 
Specify the cache directory for newer virtualenv modules
 2018-05-04 14:20:44 -05:00
Daniel Wallace
1f91a85587
specify cache dir for pip install 2018-05-04 12:48:52 -05:00
Nicole Thomas
7c3f2c56da
Merge pull request #47412 from twangboy/fix_47125 
Fix issue where the cwd was being removed
 2018-05-04 13:28:10 -04:00
Nicole Thomas
4846e957c4
Merge pull request #47467 from twangboy/cleanup_settings 
Remove unused settings, update NSIS
 2018-05-04 13:11:37 -04:00
Daniel Wallace
99e150e09c
check for kitchen-vagrant gem before loading windows tests 2018-05-04 09:45:53 -05:00
Nicole Thomas
da9871d36b
Merge pull request #47196 from twangboy/fix_47024 
Fix issues with pip
 2018-05-04 10:23:03 -04:00
Mike Place
c9bab0b8e3
Merge branch '2017.7' into fix_47125 2018-05-04 09:14:06 -05:00
Nicole Thomas
e8c4524bae
Merge pull request #47455 from Ch3LL/unreleased_rn 
Add In Progress Warning for 2017.7.6 Release Notes
 2018-05-04 09:44:54 -04:00
twangboy
9d498293b1
Remove unused settings, update NSIS 2018-05-03 16:46:03 -06:00
Nicole Thomas
2c7a4b6179
Merge pull request #47459 from gtmanfred/2017.7 
update ubuntu-rolling to 18.04
 2018-05-03 16:39:19 -04:00
Nicole Thomas
64a64c0ed7
Merge pull request #47462 from terminalmage/docs 
Fix docs build on Sphinx 1.7+
 2018-05-03 16:06:56 -04:00
Erik Johnson
6d7803ece0
Fix docs build on Sphinx 1.7+ 
Sphinx 1.7 got rid of sphinx.utils.compat. This commit allows the builds
to work both on both older and newer Sphinx.
 2018-05-03 13:31:34 -05:00
Daniel Wallace
d228e72477
update ubuntu-rolling to 18.04 2018-05-03 12:02:22 -05:00
Ch3LL
b6d0cc2ab7
Add In Progress Warning for 2017.7.6 Release Notes 2018-05-03 12:06:15 -04:00
Nicole Thomas
6cd0d31c03
Merge pull request #47438 from lomeroe/double_admx_test 
lgpo fix for issue #47436
 2018-05-03 10:40:26 -04:00
Alex Austin
cb674fb1cb Enable opkg as pkgrepo handler on Poky 2018-05-02 20:32:54 -05:00
Alex Austin
7a58fd157e Enable opkg on non-NILinuxRT systems 2018-05-02 20:32:54 -05:00
Alex Austin
139360c55f Add Poky to OS Information Grains 2018-05-02 20:32:54 -05:00
Alex Austin
d74057224d Un-normalize os_family in pkgrepo state 
The __grains__['os'].lower() code was added in
e7fb3095ce, but I don't know why. I hope
this "fix" doesn't break anything.
 2018-05-02 20:32:54 -05:00
Erik Johnson
a1e9fe00fd
Skip trying to render a template for a nonexistant SLS file 
This skips an unnecssary call to compile_template, and also prevents a
confusing error message: "Template was specified incorrectly: False",
for cases when an SLS target specified in a top file does not exist.
 2018-05-02 20:28:45 -05:00
Nicole Thomas
ed69821d19
Merge pull request #47433 from s0undt3ch/2017.7 
Add missing requirements files not commited in #47106
 2018-05-02 16:57:13 -04:00
twangboy
14ee5537b9
Add @with_tempdir helper 
Fix two state tests
Remove redundent tests
 2018-05-02 12:17:36 -06:00
Pedro Algarvio
5abadf25d6
Add missing requirements files not commited in #47106 2018-05-02 18:34:09 +01:00
lomeroe
4902f1e2ba check if a policy has either an enabled value or enabled list entry or 
a disabled value or disabled list entry when determining the state of
the policy

Some policies have one but not the other (in which case different
entries in the registry.pol file are added for 'Enabled' or 'Disabled').

A partial fix for this was
previously added, but did not check for all possible types when trying
to determine if the policy is enabled/disabled and also did not perform
the same check in the enabled/disabled list checks.

This would result in some policies being reported by the module as
Enabled even though they were disabled (for example "Windows
Components\Internet Explorer\Make proxy settings per-machine (rather
than per-user)" if set to 'Disabled' would report 'Enabled')
 2018-05-02 11:43:51 -05:00
Nicole Thomas
7ae3497b0c
Merge pull request #47429 from gtmanfred/2017.7 
server_list_min should use state, not status
 2018-05-02 12:27:55 -04:00
Mike Place
2f5fc4ecc5
Merge pull request #47399 from isbm/isbm-zeromq17-deprecationwarning-2017.7.2-v2 
zeromq 17 deprecation warning backport from 2018.3 + tornado 5 fixes
 2018-05-02 10:11:15 -05:00
Daniel Wallace
8ae32033cc
server_list_min should use state, not status 
This is what is used when getting server names quickly.
 2018-05-02 08:45:55 -05:00
Nicole Thomas
b14e974b5f
Merge pull request #47343 from Ch3LL/win_srv_test 
Add additional service module integration tests and enable for windows
 2018-05-02 09:39:45 -04:00
twangboy
6c3b5fa6fa
Fix typo 2018-05-01 16:28:48 -06:00
Shane Lee
f031710af2
Merge branch '2017.7' into fix_47024 2018-05-01 16:26:04 -06:00