valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,351 Commits 24 Branches 182 Tags 341 MiB
f20f3742cb
Commit Graph

84351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
1087a0a899 Merge pull request #42384 from letsmakesense/patch-1 
state_top value also affects pillar top file
 2017-07-28 09:50:54 -06:00
Nicole Thomas
ee8aee1496 Merge pull request #42616 from amendlik/sync-clouds 
Sync cloud modules
 2017-07-28 09:40:36 -06:00
Nicole Thomas
d6ebd7a52f Merge pull request #42599 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-07-28 09:35:39 -06:00
Gareth J. Greenaway
2e132daa73 Slight update to formatting 2017-07-28 08:33:21 -07:00
Nicole Thomas
f83960c02a Lint: Remove extra line at end of file. 2017-07-28 09:13:59 -06:00
Anil Kabra
2f3c50206b Fix calls to files utility module method from open from fopen 2017-07-28 09:40:57 -05:00
Neile Havens
8eee58af97 fix test_selinux for issue #42611 
- expect change from selinux.boolean state if it makes changes
- result = False if there's an error making changes
 2017-07-28 09:39:38 -05:00
Anil Kabra
f474016037 Merge branch 'v2016.11.5_protect_master_key' of https://github.com/Mastercard/salt into v2016.11.5_protect_master_key 2017-07-28 07:46:08 -05:00
Anil Kabra
7875ee9d34 Fixed error due to new files module in utils 2017-07-28 07:44:50 -05:00
Adam Mendlik
ab21bd9b5b Sync cloud modules when saltutil.sync_all is run 
Fixes #12587
 2017-07-28 06:00:16 -06:00
Andrew Bulford
c7d364ec56 Add regression tests for #41982 
These test the scenarios where another network with a similar name
already exists, verifying that absent doesn't attempt to remove a
network which isn't specified, and present still attempts to create the
specified network despite a similarly named network already being present.
 2017-07-28 10:41:44 +01:00
Andrew Bulford
d31f2913bd Fix broken unit test test_network_absent 
This started failing following commit 515c612, which relied on the
'Name' key being present in the return value of docker.networks -
as the mock didn't have this set the test started failing.
 2017-07-28 09:57:45 +01:00
Andrew Bulford
d42f781c64 Add trace logging of docker.networks result 
Added during debugging of failing test to determine what
docker.networks is expected to return, keeping as it seems useful.
 2017-07-28 09:55:05 +01:00
Neile Havens
73c4b7833c fix for issue #42611 2017-07-27 22:26:49 -05:00
twangboy
41f0f75a06 Add new var to list, change to runas_password 2017-07-27 18:01:26 -06:00
garethgreenaway
4f0694f4fe Merge branch 'develop' into develop 2017-07-27 17:00:51 -07:00
garethgreenaway
bab7503f68 Merge branch 'develop' into linux_acl_fixes-gh 2017-07-27 16:59:36 -07:00
garethgreenaway
549495831f Merge pull request #42586 from gdubroeucq/2016.11 
[Fix] yumpkg.py: add option to the command "check-update"
 2017-07-27 16:51:59 -07:00
garethgreenaway
29ad9e93a6 Merge branch 'develop' into develop 2017-07-27 16:46:20 -07:00
garethgreenaway
91236cf842 Merge branch 'develop' into preflight_cmds 2017-07-27 16:34:34 -07:00
Nicole Thomas
e2dd443002 Merge pull request #42601 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-27 16:32:06 -06:00
Nicole Thomas
22eea389fa Merge pull request #42290 from isbm/isbm-module_run_parambug_42270_217 
Backport of #42270
 2017-07-27 16:30:05 -06:00
Anil Kabra
3a9746f67e Merge branch 'develop' into v2016.11.5_protect_master_key 2017-07-27 17:04:51 -05:00
twangboy
b9c91eba60 Add runas_passwd as a global for states 2017-07-27 15:46:58 -06:00
Aneesh Agrawal
8d8fe4f777 Add new YAML dumper with improved readability 
By default, the YAML dumper will output lists that are values in a
dictionary flush with the key they are under:
```
key1: value1
key2:
- a
- b
- c
```

This new dumper causes the list members to be indented by two spaces,
improving readability:
```
key1: value1
key2:
  - a
  - b
  - c
```

It can be used by passing the new `IndentedSafeOrderedDumper`,
or any other dumper which includes the `IndentMixin`,
to the `yaml.dump` function:
```
dumper = __utils__['yamldumper.get_dumper']('IndentedSafeOrderedDumper')
yaml.dump(some_dict, Dumper=dumper)
```
 2017-07-27 21:46:21 +00:00
Nicole Thomas
6b45debf28 Merge pull request #41988 from redmatter/fix-dockerng-network-matching 
Fix dockerng.network_* name matching
 2017-07-27 15:25:06 -06:00
Daniel Wallace
cc4e45656d Allow not interpreting backslashes in the repl 
Without this, if append or prepend is used with file.replace, the backslashes
will not be interpreted when appending the file, but the next time the state is
run, the backslashes could be interpreted and removed from the line.
 2017-07-27 14:21:58 -06:00
Gareth J. Greenaway
74bae13939 Small update to something I missed in the first commit. Updating tests to also test for pillar values. 2017-07-27 13:19:48 -07:00
Michael Gibson
5099566c43 Merge branch 'develop' into features/issue-42280 2017-07-27 14:10:46 -06:00
Michael Gibson
37d1cd2d25 Merge pull request #1 from cro/issue-42280 
Add different bindpw behavior to the Oxygen release notes.
 2017-07-27 14:10:17 -06:00
rallytime
36a1bcf8c5 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_wua.py
  - salt/utils/schedule.py
  - tests/unit/modules/rabbitmq_test.py
 2017-07-27 14:00:15 -06:00
C. R. Oldham
2cc808e2b8 Add different bindpw behavior to the Oxygen release notes. 2017-07-27 13:56:13 -06:00
rallytime
9b66464fcc Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-07-27 13:52:52 -06:00
Mike Place
4c20f1cfbb Merge pull request #42251 from twangboy/unit_win_test_win_ip 
Fix `unit.modules.test_win_ip` for Windows
 2017-07-27 14:22:03 -05:00
Mike Place
2985e4c0e6 Merge pull request #42255 from twangboy/win_unit_test_win_system 
Fix `unit.modules.test_win_system` for Windows
 2017-07-27 14:12:41 -05:00
Mike Place
f0122894c6 Merge pull request #42590 from TiteiKo/patch-1 
Fix missing tornado import
 2017-07-27 14:08:10 -05:00
Nicole Thomas
4b16109122 Merge pull request #42339 from isbm/isbm-jobs-scheduled-in-a-future-bsc1036125 
Bugfix: Jobs scheduled to run at a future time stay pending for Salt minions (bsc#1036125)
 2017-07-27 13:05:50 -06:00
Nicole Thomas
6c5a7c604a Merge pull request #42077 from vutny/fix-jobs-scheduled-with-whens 
Fix scheduled job run on Master if `when` parameter is a list
 2017-07-27 13:04:22 -06:00
Mike Place
8dfc927a18 Merge pull request #42337 from cloudflare/textfsm-cli 
Enhance napalm CLI execution function to use the TextFSM mod
 2017-07-27 13:57:37 -05:00
Mike Place
fd0c5ead60 Merge pull request #42344 from steverweber/fix_infoblox 
replace infoblox module and state with different implementation
 2017-07-27 13:53:10 -05:00
Mike Place
66a2a8edc0 Merge pull request #42398 from garethgreenaway/42189_show_docs_then_error 
Show documentation when no function is included
 2017-07-27 13:49:35 -05:00
Mike Place
f9cb536589 Merge pull request #42414 from vutny/unify-hash-params-format 
DOCS: unify hash sum with hash type format
 2017-07-27 13:48:40 -05:00
Mike Place
71b4c86a40 Merge pull request #42430 from alexbleotu/esxdatacenter_proxy-gh 
Esxdatacenter proxy + related updates
 2017-07-27 13:47:10 -05:00
Mike Place
a573386260 Merge pull request #42528 from twangboy/win_fix_pkg_state 
Namespace `cmp_to_key` in the pkg state for Windows
 2017-07-27 13:30:22 -05:00
Anil Kabra
acfc5fb710 Resolved merge conflict 2017-07-27 13:28:41 -05:00
Gareth J. Greenaway
928a4808dd Updating the superseded and deprecated decorators to work when specified as pillar values. 2017-07-27 11:25:23 -07:00
Sigmon, Jeffrey
bb29afd022 Passphrase protect master private key 2017-07-27 13:17:26 -05:00
Mike Place
535c922511 Merge pull request #42523 from rallytime/fix-42375 
Add a mention of the True/False returns with __virtual__()
 2017-07-27 13:13:06 -05:00
Daniel Wallace
559d432930 fix tests 2017-07-27 12:00:38 -06:00
Mike Place
62ae12bcd9 Merge pull request #42534 from jmarinaro/2017.7 
Fixes AttributeError thrown by chocolatey state
 2017-07-27 12:59:50 -05:00