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,420 Commits 24 Branches 182 Tags 341 MiB
f05b86979a
Commit Graph

96420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
f05b86979a
Merge branch 'develop' into fix-40532 2018-07-26 14:20:48 -04:00
Nicole Thomas
4cc778ab3d
Merge pull request #48755 from markuskramerIgitt/test_minion_id_lowercase 
Add configuration test for minion_id_lowercase
 2018-07-26 14:18:05 -04:00
Nicole Thomas
a7dc3ddcc8
Merge pull request #48762 from mirceaulinic/rm-template-mod 
Get rid of the template module and rework a couple of modules
 2018-07-26 11:42:15 -04:00
Mircea Ulinic
9af9100dee Get rid of the template mod dependency and simplify the code and usage of the pyeapi 2018-07-26 06:48:10 +00:00
Mircea Ulinic
6c70bbadde Get rid of the template mod dependency and simplify the code and usage of the nxos_api 2018-07-26 06:48:10 +00:00
Mircea Ulinic
ed704b4d49 Get rid of the template mod dependency and simplify the code and usage of the netmiko module 2018-07-26 06:48:02 +00:00
Markus
b11ad022a7
Merge branch 'develop' into test_minion_id_lowercase 2018-07-25 18:06:21 +02:00
Nicole Thomas
fb5d63da16
Merge pull request #48761 from isbm/isbm-add-saltapi-logrotate 
Add API log rotation on SUSE package
 2018-07-25 11:42:45 -04:00
Nicole Thomas
816f7edc81
Merge pull request #48716 from thetoolsmith/develop 
add salt cloud support for block device tagging or root devices and such
 2018-07-25 11:07:56 -04:00
Nicole Thomas
66a97f270d
Merge pull request #48746 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-07-25 11:01:15 -04:00
Nicole Thomas
705358705c
Merge pull request #48757 from kuetrzi/kuetrzi-patch-1 
Update carbon_return.py
 2018-07-25 10:58:34 -04:00
Nicole Thomas
097eba1b62
Merge pull request #48770 from Ch3LL/update_doc_develop 
Update Saltstack Logo banner on docs.saltstack.com
 2018-07-25 10:47:32 -04:00
Ch3LL
e760c8466a
Update Saltstack Logo banner on docs.saltstack.com 2018-07-25 10:43:37 -04:00
markuskramerIgitt
560fab5da5 Test lowercase on id_function 2018-07-25 14:05:55 +02:00
Bo Maryniuk
3a149b0009 Add API log rotation on SUSE package 2018-07-25 11:19:53 +02:00
Mircea Ulinic
11fe1fc010 Revert "Adding the template module for autodoc" 
This reverts commit e369357ff3.
 2018-07-25 08:30:16 +00:00
Mircea Ulinic
d4c137c39f Revert "Adding the template execution module, as a helper for CLI and other modules" 
This reverts commit 1afe33436a.
 2018-07-25 08:29:50 +00:00
markuskramerIgitt
88786da025 Reduceded config, commented, dedented 2018-07-25 07:29:25 +02:00
markuskramerIgitt
e9c310c2a5 PEP8 E303: too many blank lines (3) 2018-07-25 00:58:47 +02:00
markuskramerIgitt
7ec9f358f1 Merge branch 'develop' of https://github.com/saltstack/salt into test_minion_id_lowercase 2018-07-25 00:15:58 +02:00
markuskramerIgitt
aec73330bb Add configuration test for minion_id_lowercase 2018-07-25 00:13:22 +02:00
Paul Bruno
0d4ad6eac1 improve document example 2018-07-24 16:31:08 -04:00
Paul Bruno
faa57c76a8 make recommended changes, update documentation 2018-07-24 16:27:46 -04:00
Paul Bruno
2926a2421a Merge remote-tracking branch 'upstream/develop' into develop 2018-07-24 15:34:22 -04:00
rallytime
12fee6d1b9
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/acme.py
  - salt/modules/npm.py
  - salt/states/acme.py
 2018-07-24 14:19:22 -04:00
Nicole Thomas
7f7bfb1d86
Merge pull request #48393 from FraaJad/develop 
consul_pillar.py disable yaml loader and nest in pillar subkey
 2018-07-24 13:58:15 -04:00
Nicole Thomas
8958c30d13
Merge pull request #48687 from mirceaulinic/jira-mod 
Adding a new execution module to manipulate JIRA tickets
 2018-07-24 13:48:47 -04:00
Nicole Thomas
062fe7cccf
Merge pull request #48718 from garethgreenaway/48536_beacon_diskusage_fixes 
[2018.3] beacon diskusage fixes
 2018-07-24 13:45:25 -04:00
Nicole Thomas
968e2e0b9e
Merge pull request #48713 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-07-24 13:39:30 -04:00
Nicole Thomas
e873621009
Merge pull request #48711 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-07-24 13:38:57 -04:00
Nicole Thomas
c6469065fc
Merge pull request #48721 from rallytime/fix-beacon-test 
[develop] Fix beacon test that fails on python 3
 2018-07-24 13:37:28 -04:00
Nicole Thomas
e5dac2bedc
Merge pull request #48722 from rallytime/fix-apache-test 
[develop] Fix apache tests that fail on python 3
 2018-07-24 13:36:54 -04:00
Nicole Thomas
3e293feb4d
Merge pull request #48745 from rallytime/saltconf-ad-develop 
[develop] Update DOCBANNER with new SaltConf18 image
 2018-07-24 13:17:33 -04:00
rallytime
1397d72efe
Update DOCBANNER with new SaltConf18 image 
And remove enterprise ad
 2018-07-24 13:16:32 -04:00
Nicole Thomas
6c7f1c549d
Merge pull request #48744 from rallytime/saltconf-ad-2018.3 
[2018.3] Update DOCBANNER with new SaltConf18 image
 2018-07-24 13:15:39 -04:00
rallytime
dbc1f8b772
Update DOCBANNER with new SaltConf18 image 
And remove enterprise ad
 2018-07-24 13:14:42 -04:00
Daniel Wozniak
04ab17a4d6
Merge pull request #48726 from dwoz/syslogtest 
Skip test when syslog not available
 2018-07-24 09:12:44 -07:00
Nicole Thomas
af837424aa
Merge pull request #48727 from dwoz/file_cp_test_fix 
Windows compatible cp test
 2018-07-24 10:41:33 -04:00
Daniel A. Wozniak
6e7824266b
Windows compatible cp test 2018-07-23 23:27:29 -07:00
Daniel A. Wozniak
00f04cfd59
Skip test when syslog not available 2018-07-23 23:11:42 -07:00
Paul Bruno
0b0e4997c2
Merge branch 'develop' into develop 2018-07-23 19:10:47 -04:00
kuetrzi
a71ca4aba2
Update carbon_return.py 
fix TypeError: not all arguments converted during string formatting
caused by extra comma accidentally being added to log statement in unicode literals update
 2018-07-24 10:53:06 +12:00
Paul Bruno
6b3083d9af rework based on lint suggestions 2018-07-23 18:39:06 -04:00
Nicole Thomas
70e75c2be6
Merge branch 'develop' into jira-mod 2018-07-23 18:15:15 -04:00
Paul Bruno
75270ba607 fix pylint not in error 2018-07-23 17:50:30 -04:00
FraaJad
093dfad578
Merge branch 'develop' into develop 2018-07-23 14:18:06 -07:00
Paul Bruno
bd22b9a9ac should make Name tag only default if the user has not defined it in the cloud configuration file 2018-07-23 17:17:10 -04:00
Nicole Thomas
04125b077d
Merge pull request #48710 from rallytime/bp-47510 
Back-port #47510 to 2018.3
 2018-07-23 17:11:17 -04:00
Nicole Thomas
080d8b30e6
Merge pull request #48707 from mirceaulinic/napalm-pyeapi-nxos-gate 
Add several new functions to the napalm module
 2018-07-23 17:03:10 -04:00
Paul Bruno
61a74b68a4 fix indenting 2018-07-23 16:56:38 -04:00