valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
96,487 Commits 24 Branches 182 Tags 341 MiB
531955b279
Commit Graph

96487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
266c6f250e
Merge pull request #48685 from bbinet/none-changes 
Use empty dict for 'changes' instead of None
 2018-07-20 13:12:42 -04:00
Mike Place
9f32f15163
Merge pull request #48690 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 10
 2018-07-20 11:00:24 -06:00
Ch3LL
2bedadfadb
Add windows pkg module integration tests 2018-07-20 12:47:37 -04:00
rallytime
97cc563f13
Reduce the number of days an issue is stale by 10 2018-07-20 12:38:53 -04:00
Nicole Thomas
5a6f7a085c
Merge pull request #48670 from bbinet/traverse 
Add the "traverse" jinja filter
 2018-07-20 12:36:20 -04:00
Nicole Thomas
b29ed80f2c
Merge pull request #48596 from pritambaral/git-shallow-clone-tags 
git.latest: Add support for shallow-cloning tags
 2018-07-20 12:32:46 -04:00
Nicole Thomas
83f8b1d1cd
Merge pull request #48478 from sjorge/fileserver_future_cache 
Fileserver should handle list_cache from the future
 2018-07-20 12:13:52 -04:00
Nicole Thomas
b0440871a0
Merge branch '2018.3' into docker-unboundlocal 2018-07-20 11:55:04 -04:00
Nicole Thomas
96447ce541
Merge pull request #48656 from Ch3LL/windows_ip_mod 
Add windows ip module integration tests
 2018-07-20 10:57:44 -04:00
Nicole Thomas
ff11763fd3
Merge pull request #48594 from pritambaral/bp-48418 
Backport 48418
 2018-07-20 10:57:18 -04:00
Nicole Thomas
0c5fff3dc8
Merge pull request #48638 from twangboy/fix_vcredist 
Remove vcredist 2015 from Py3 installer
 2018-07-20 10:56:39 -04:00
Nicole Thomas
49653566e8
Merge pull request #48616 from gtmanfred/sdb 
Add tests for vault + sdb
 2018-07-20 10:53:40 -04:00
Nicole Thomas
111908f519
Merge pull request #48440 from mmulqueen/patch-1 
Make core.py tolerant of invalid chars in DMI data
 2018-07-20 10:48:06 -04:00
Nicole Thomas
1f988ff93f
Merge pull request #48537 from twangboy/zh_1374 
Improved Status Beacon for Windows
 2018-07-20 10:46:33 -04:00
Nicole Thomas
ead19725b6
Merge branch '2017.7' into fix_48169 2018-07-20 10:45:59 -04:00
Nicole Thomas
103d6dcec6
Merge pull request #48586 from astorath/add-vault-token-role 
added named roles feature for module.vault
 2018-07-20 10:38:59 -04:00
Nicole Thomas
754cd9ef3c
Merge branch 'develop' into develop 2018-07-20 10:36:25 -04:00
Nicole Thomas
19528bf204
Merge pull request #47909 from gmsoft-tuxicoman/solaris-fix 
Fix salt.states.pkg.latest for IPS packages on Solaris
 2018-07-20 10:34:52 -04:00
Nicole Thomas
1ebd96d909
Merge pull request #48664 from Ch3LL/srv_disable_mac 
[2017.7] Fix service.disabled test for macosx
 2018-07-20 10:32:55 -04:00
Nicole Thomas
4e77b242f2
Merge pull request #48663 from Ch3LL/srv_disable_mac_2018 
[2018.3] Fix service.disabled test for macosx
 2018-07-20 10:32:21 -04:00
Nicole Thomas
dfc1582475
Merge pull request #48304 from Ch3LL/swap_mac 
Fix macosx grains when swapusage returns comma
 2018-07-20 10:30:58 -04:00
Nicole Thomas
3da3cf2f3f
Merge pull request #48625 from Ch3LL/ssh_state 
Follow up to PR #48555
 2018-07-20 10:27:55 -04:00
Nicole Thomas
f2fb14c1a3
Merge branch 'develop' into merge-develop 2018-07-20 10:14:47 -04:00
Nicole Thomas
33812f78f1
Merge pull request #48673 from Ch3LL/mac_port 
Use different pub and ret ports for testprogram integration tests
 2018-07-20 10:11:51 -04:00
Nicole Thomas
5f6a7c4d89
Merge pull request #48675 from Ch3LL/mac_disable 
Fix mac service.disable tests
 2018-07-20 10:09:40 -04:00
Nicole Thomas
93d2f51d2b
Merge pull request #48658 from wyardley/wyardley-npm-json-output-2017 
Improve handling of json output (#43138)
 2018-07-20 10:08:33 -04:00
Nicole Thomas
3e293b0513
Merge pull request #48678 from OrlandoArcapix/fix-npm-dryrun-test 
Fix for issue #48677 - return clean npm.bootstrap on no changes
 2018-07-20 10:07:22 -04:00
Nicole Thomas
7889e4ce66
Merge pull request #48683 from slivik/fix-zabbix_host-host-inventory-update-fails 
Fixed zabbix host inventory manipulation.
 2018-07-20 10:00:14 -04:00
Nicole Thomas
9d7eabd24e
Merge pull request #48671 from bbinet/grafana-fixes 
Few fixes to the grafana module and states
 2018-07-20 09:58:02 -04:00
Bruno Binet
842eb3da24 Use empty dict for 'changes' instead of None 
See #47059 #46985
 2018-07-20 15:49:41 +02:00
Nicole Thomas
3baa31886c
Merge pull request #48356 from mirceaulinic/pyeapi-modules 
Adding a pair of proxy and execution modules for managing Arista switches via the pyeapi
 2018-07-20 09:32:44 -04:00
Bruno Binet
32b6d22cf2 Fix RST syntax issue in doc 2018-07-20 13:57:22 +02:00
Bruno Binet
3c5083f550 Add support for dry run (test=True) of grafana states 
Fixes #43675
 2018-07-20 11:52:10 +02:00
slivik
348ab3229b
Fixed zabbix host inventory manipulation. 2018-07-20 11:09:00 +02:00
Bernd May
0348cea22b
Add query current minion config with config.items 
Fixes #48680
 2018-07-20 01:26:41 +02:00
Orlando Richards
851a404f6b Fix for issue #48677 - return True when no changes are to be made with npm.bootstrap with test=true 2018-07-19 22:33:39 +01:00
Nicole Thomas
07a1f6520f
Merge pull request #48580 from rallytime/fix-46884 
Don't error on retcode 0 in libcrypto.OPENSSL_init_crypto call
 2018-07-19 15:21:12 -04:00
Ch3LL
c78efab828
Fix mac service.disable tests 2018-07-19 14:15:58 -04:00
markuskramerIgitt
1cb0b5c6a7 Lesser logging 2018-07-19 20:04:06 +02:00
markuskramerIgitt
2a88ebb102 DarkGreen Foreground 2018-07-19 19:35:12 +02:00
Ch3LL
87dd85a220
Use different pub and ret ports for testprogram integration tests 2018-07-19 13:07:27 -04:00
Frode Gundersen
0747f2e58a
add service enabled test 2018-07-19 16:47:56 +00:00
markuskramerIgitt
5e3bcc2e3f remove windows build cache 2018-07-19 18:25:21 +02:00
Bruno Binet
7e7ae8ace7 influxdb: fix conflicts in function arg names with client_args 
Rename client_args names so that it won't conflict anymore with some
named parameters of influx module function.

For example, the "create_user" function had a "password" argument that
was conflicting with the "password" named argument from client_args.
 2018-07-19 18:21:33 +02:00
Bruno Binet
73a24b774a Ignore readOnly option when diffing 
readOnly value is true only for datasource stored in config (not created
dynamically through the grafana API)
See: https://github.com/grafana/grafana/pull/9659
 2018-07-19 18:13:05 +02:00
Bruno Binet
81f0cf8a3f Add missing profile argument to grafana4.get_user_data 2018-07-19 18:08:14 +02:00
Bruno Binet
37a41226d5 Add the "traverse" jinja filter 
which can be really useful in states to select some leaf pillar data or
fallback with a default value.
 2018-07-19 17:59:30 +02:00
Ch3LL
bddfbd75d2
reverse assertion order for service disable test 2018-07-19 10:38:10 -04:00
Ch3LL
f1fbfad387
move the disable call up in try block 2018-07-19 10:32:21 -04:00
Ch3LL
f60d21bda4
reverse assertion order for service disable test 2018-07-19 10:29:18 -04:00