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
92,981 Commits 24 Branches 182 Tags 341 MiB
ed40371a06
Commit Graph

92981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
8008fca2f6
Merge pull request #47933 from terminalmage/add-pillar.get-docs 
Clarify pillar.get docs
 2018-06-04 10:07:57 -04:00
Nicole Thomas
ab565bfaa3
Merge pull request #47944 from terminalmage/fix-git.detached-docs 
Replace use of deprecated argument name in git.detached docstring
 2018-06-04 09:53:33 -04:00
Nicole Thomas
484d83014b
Merge pull request #47557 from L4rS6/fix-broken-rabbitmq-list-policies 
fix broken rabbitmq list policies in rabbitmq version 3.7
 2018-06-04 09:25:06 -04:00
Nicole Thomas
866a2fbf5e
Merge pull request #47949 from terminalmage/salt-jenkins-1000 
Continued troubleshooting on salt-jenkins 1000
 2018-06-04 09:17:13 -04:00
L4rS6
6d7ef27557
Merge branch '2018.3' into fix-broken-rabbitmq-list-policies 2018-06-04 10:59:30 +02:00
Lars Wagner
e043ea2833 refactored list_policies code and added more tests 2018-06-04 10:56:12 +02:00
Erik Johnson
9c369c6aa8
Remove temp logging from test 
It's now being logged in run_script itself
 2018-06-04 00:19:30 -05:00
Erik Johnson
af02d5ba7b
Add result logging to run_script, make returns DRY 2018-06-04 00:17:41 -05:00
Erik Johnson
1d082b4389
Replace use of deprecated argument name in git.detached docstring 2018-06-03 00:19:11 -05:00
Erik Johnson
d0cf06a24d
Make sure we set the effective environment when lock_saltenv is True 2018-06-02 23:19:45 -05:00
Erik Johnson
0b85d1273f
Merge pull request #47941 from terminalmage/salt-jenkins-1000 
Update test logging for salt-jenkins
 2018-06-02 21:40:55 -05:00
Erik Johnson
fb66368af9
Update test logging for salt-jenkins 1000 2018-06-02 21:39:17 -05:00
Damon Atkins
6253793cb6
Merge branch '2017.7' into 2017.7_win_pkg_keys_fix 2018-06-03 11:23:16 +10:00
Erik Johnson
4eb022b675
Clarify pillar.get docs 
Explicitly state that pillar.get pulls from in-memory pillar data.
 2018-06-01 17:06:02 -05:00
Nicole Thomas
58b5f2b4dd
Merge pull request #47924 from Ch3LL/mac_gitpy 
Catch all exceptions in git import for salt.utils.gitfs
 2018-06-01 17:06:57 -04:00
Rares POP
c51e732f4d
Fixup! beacons/avahi_announce.py finding grains 
This pull resquest broke the avahi_announce
https://github.com/saltstack/salt/pull/45657
because len('grains.') is 7 and not 6 as this
change say.
What happens now is that is looking in
__grains__ for '.{grain_name}' instead of {grain_name}.

Signed-off-by: Rares POP <rares.pop@ni.com>
 2018-06-01 15:50:53 -04:00
Claudius Zingerli
5c666409f3
Spelling fix 2018-06-01 15:48:43 -04:00
Claudius Zingerli
cfe0a5bb42
network_settings: Fix doc using new list/dict syntax 2018-06-01 15:48:38 -04:00
rallytime
7e1d278d19
Update old utils paths to use new utils paths 2018-06-01 15:00:46 -04:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
 2018-06-01 14:54:12 -04:00
twangboy
4538b3abb3
Remove 'len-as-condition' disablement 2018-06-01 11:51:52 -06:00
twangboy
d4efcc3c8b
Skip lint errors 2018-06-01 11:51:08 -06:00
twangboy
1b3977f8d4
Remove m2crypto download for Windows 
Fix pip issue with pip 10
 2018-06-01 11:50:59 -06:00
David Murphy
ac15d2093a Backport of PR 47808 to 2018.3, improved grains support for AIX 2018-06-01 11:06:04 -06:00
Ch3LL
75c51ad69b
Catch all exceptions in git import for salt.utils.gitfs 2018-06-01 11:58:27 -04:00
Nicole Thomas
a2b588299b
Merge pull request #47860 from terminalmage/state-writing-docs 
Clean up doc build warnings, add best practices for writing states
 2018-06-01 10:42:54 -04:00
Damon Atkins
4ce0fe6546 win_pkg under py3 keys returns a view instead of a list, wrap keys in list() 2018-06-02 00:12:20 +10:00
Daniel Wallace
b88ec5258d
Merge pull request #47879 from dwoz/ami_role_fix 
Fix ami role usage warts #47269
 2018-06-01 09:11:55 -05:00
Daniel Wallace
d2f3377b5b
Merge pull request #47877 from dwoz/sleep_audit 
Revert job chunk wait time change
 2018-06-01 09:11:45 -05:00
Daniel Wallace
735e92093e
Merge pull request #47917 from dwoz/winsuite 
Fix windows tests suite breakage
 2018-06-01 06:42:14 -05:00
Daniel A Wozniak
118601ebd6
Fix windows tests suite breakage 2018-05-31 23:17:18 -07:00
Erik Johnson
8cb33d3dec
Quiet the linter 
We need this import to determine whether we have the needed modules to
run the test, even though it is not invoked directly.
 2018-05-31 15:28:25 -05:00
Erik Johnson
af51e16f23
Use more elegant RST syntax 2018-05-31 15:28:25 -05:00
Erik Johnson
91cd57d1e0
Update mocking to reflect changes in service module 2018-05-31 15:28:25 -05:00
Erik Johnson
b9ace5a859
Fix crappy mocking 
This fixes some poorly-conceived mocking that was done because of some
equally dumb imports being done in salt/modules/junos.py (which I fixed
a few commits ago while in the process of cleaning up the docs).
 2018-05-31 15:28:25 -05:00
Erik Johnson
bc9e3acef3
Lint fixes 2018-05-31 15:28:25 -05:00
Erik Johnson
d37f7e4f04
Add 2017.7.6 release notes 2018-05-31 15:28:25 -05:00
Erik Johnson
9dddeeefab
Improve documentation on syncing states 2018-05-31 15:28:25 -05:00
Erik Johnson
f465fa3ca7
Add best practices docs for writing states 2018-05-31 15:28:25 -05:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings 
Well, all but one, which we expect to see
 2018-05-31 15:28:25 -05:00
Erik Johnson
64b9b4d0b8
Clarify that name would override the id declaration 2018-05-31 15:28:24 -05:00
Nicole Thomas
b09596982b
Merge pull request #47788 from twangboy/fix_47559 
Use pytz to calculate timezones
 2018-05-31 14:33:19 -04:00
Nicole Thomas
ae73cb3947
Merge pull request #47899 from terminalmage/salt-jenkins-1000 
salt-jenkins issue 1000
 2018-05-31 14:24:48 -04:00
Nicole Thomas
8f78e3aef6
Merge pull request #47753 from Ch3LL/service_mac 
Add stderr launchctl helper class and fix service mac tests
 2018-05-31 14:16:57 -04:00
Nicole Thomas
828bf39695
Merge pull request #47908 from meaksh/2018.3-align-suse-salt-master-service 
Align SUSE salt-master.service 'LimitNOFILES' limit with upstream Salt
 2018-05-31 14:13:27 -04:00
Nicole Thomas
0d229c6182
Merge branch '2018.3' into fix_47559 2018-05-31 11:28:30 -04:00
Pablo Suárez Hernández
efe308013a
Align SUSE salt-master.service 'LimitNOFILES' limit with upstream Salt 2018-05-31 11:02:18 +01:00
twangboy
9e612ec9e7
Fix markup in release notes 2018-05-30 16:10:26 -06:00
Nicole Thomas
b4bac9b41b
Merge pull request #47868 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-30 17:20:37 -04:00
Nicole Thomas
63efb76d51
Merge pull request #47822 from Ch3LL/win_user_test 
Add user state integration tests to windows
 2018-05-30 17:13:06 -04:00