valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,001 Commits 24 Branches 182 Tags 341 MiB
c71756ab46
Commit Graph

65001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorge Schrauwen
ead9fce6b1 expect the new exception that can be thrown and handle it 2016-01-25 19:41:57 +00:00
Joseph Hall
4e6e47d67a Allow alternate root 2016-01-25 12:40:22 -07:00
rallytime
57b7e6cc93 Add glance state to list of state modules 
Fixes #30621
 2016-01-25 12:35:19 -07:00
Nicole Thomas
a48ffaa84e Merge pull request #30590 from mlalpho/salt-utils-cloud-updates 
salt-utils-cloud updates
 2016-01-25 12:30:43 -07:00
Nicole Thomas
653292ec88 Merge pull request #30555 from twangboy/mac_brew 
renamed brew.py to mac_brew.py
 2016-01-25 12:30:31 -07:00
Jorge Schrauwen
4d2fa2e2aa switch unit test to except CommandExecutionError 2016-01-25 19:30:09 +00:00
Joseph Hall
51cba1e6a4 Need to pass an empty device 2016-01-25 12:26:22 -07:00
Jorge Schrauwen
7b1429879e switch to raising an exception as mentioned in #30578 2016-01-25 19:14:59 +00:00
rallytime
3f8b905642 Fix test failures 2016-01-25 12:08:30 -07:00
Jorge Schrauwen
4a11cb808e Fix salt.states.archive __virtual__ 2016-01-25 19:05:37 +00:00
Nicole Thomas
7f9ffd5ef4 Merge pull request #30616 from rallytime/merge-30610 
Merge #30610 with pylint fix
 2016-01-25 12:03:31 -07:00
Michael Alphonso
e3bbf0da19 put back the call to subshell sh -c 2016-01-25 13:45:52 -05:00
Nicole Thomas
25f127c948 Merge pull request #30580 from sjorge/module-timezone 
salt.modules.timezone improvements for Solaris-like OS's
 2016-01-25 11:43:25 -07:00
twangboy
9280603549 Updated release notes for boron to reflect filename changes 2016-01-25 11:32:57 -07:00
Nicole Thomas
05349071dc Merge pull request #30503 from StackPointCloud/profitbricks-cloud-provider 
Adds cloud provider support for ProfitBricks
 2016-01-25 11:28:41 -07:00
Joseph Hall
aba28a1baf Lint 2016-01-25 11:27:59 -07:00
Michael Alphonso
2c9d59fa42 looks like a re-merge of PR #20972 which relates to #19288 2016-01-25 11:22:11 -07:00
Nicole Thomas
5bcae187c1 Merge pull request #30395 from twangboy/mac_system 
Mac System Module
 2016-01-25 11:14:42 -07:00
Justin Findlay
1c6c394d0e Merge pull request #30615 from jfindlay/2015.8 
add 2015.8.4 release notes
 2016-01-25 11:11:02 -07:00
Justin Findlay
e4043403e4 add 2015.8.4 release notes 2016-01-25 11:10:07 -07:00
rallytime
bf100c1ef5 Merge #30610 with pylint fix 2016-01-25 11:10:04 -07:00
Michal Suba
466f98d761 move password_column to the end of kwargs 2016-01-25 19:06:47 +01:00
Ethan Devenport
de7d1666f6 Updates made after PR review: 
* Improved and cleaned up documentation.
* Removed unnecessary namespaces.
* Made to fail when no ssh_host is found.
* Cleared pylint violations.
 2016-01-25 18:02:10 +00:00
Bo Maryniuk
ee9b3f859b Bugfix: do not treat SLS id as a package name if an empty 'pkgs' list specified. 2016-01-25 19:01:42 +01:00
Joseph Hall
65d72b43f5 Deprecate salt/modules/img.py 2016-01-25 10:55:56 -07:00
Nicole Thomas
ec50581aad Merge pull request #30612 from rallytime/bp-29940 
Back-port #29940 to 2015.8
 2016-01-25 10:52:43 -07:00
Nicole Thomas
0a3a9aa45f Merge pull request #30592 from mlalpho/salt-boto_rds-updates 
salt-boto_rds updates
 2016-01-25 10:51:40 -07:00
Nicole Thomas
b8009d7320 Merge pull request #30552 from twangboy/mac_pkgutil 
Renamed darwin_pkgutil.py to mac_pkgutil.py
 2016-01-25 10:47:57 -07:00
Nicole Thomas
fb0054afb5 Merge pull request #30556 from twangboy/mac_sysctl 
rename darwin_sysctl.py to mac_sysctl.py
 2016-01-25 10:46:04 -07:00
Nicole Thomas
190d22b1c3 Merge pull request #30558 from twangboy/mac_desktop 
renamed osxdesktop.py to mac_desktop.py
 2016-01-25 10:45:09 -07:00
Nicole Thomas
625559c7af Merge pull request #30566 from twangboy/mac_power 
Mac power
 2016-01-25 10:44:34 -07:00
Colton Myers
48373e0ea9 Merge pull request #30613 from basepi/minion_clearfuncs_2015.8 
Fix minion/syndic clearfuncs
 2016-01-25 10:40:59 -07:00
Nicole Thomas
1304dbb667 Merge pull request #30575 from sjorge/pkg-smartos 
smartos packages are frozen so adding modules via pip does not work, …
 2016-01-25 10:40:21 -07:00
Jorge Schrauwen
98664445c7 Swapping one unknow for debian failed, because debian use a different 
function internally. Switched to RedHat for the test as it returns
LANG=XYZ
 2016-01-25 17:38:51 +00:00
Nicole Thomas
9879cadfab Merge pull request #30585 from sjorge/module-mdata 
implement salt.module.smartos_mdata
 2016-01-25 10:38:49 -07:00
Kris Raney
e10a10050b Put in pylint forward compatibility recommendation. 2016-01-25 11:33:05 -06:00
Jorge Schrauwen
e4c511de4a update tests, we have a correct return now 2016-01-25 17:30:23 +00:00
Nicole Thomas
d5b8ecf579 Merge pull request #30607 from eyj/pr-snapshot-credentials 
Fix credentials passing in boto_ec2.snapshot_created
 2016-01-25 10:19:53 -07:00
Nicole Thomas
89b4f3de1b Merge pull request #30609 from seanjnkns/backport_30602 
Fix documentation for pillar_merge_lists which default is False, not …
 2016-01-25 10:15:45 -07:00
Christophe Drevet-Droguet
3ebb8249d7 file.line: better diff 2016-01-25 10:12:32 -07:00
Nicole Thomas
a06734c4ec Merge pull request #30591 from mlalpho/salt-cloud-clouds-ec2-AssociatePublicIpAddress-fix 
salt-cloud-clouds-ec2 AssociatePublicIpAddress fix
 2016-01-25 10:03:07 -07:00
Michal Suba
603029bc04 Update mysql.py 
fixed trailing whitespace
 2016-01-25 18:00:35 +01:00
Nicole Thomas
eb771585f9 Merge pull request #30602 from seanjnkns/pillar_merge_lists-doc-bug 
Fix documentation for pillar_merge_lists which default is False, not …
 2016-01-25 09:54:52 -07:00
Kris Raney
92cf88e5fd Retry waiting for IAM role to be propagated 2016-01-25 10:50:22 -06:00
Nicole Thomas
24ead62c41 Merge pull request #30584 from julianbrost/fix-doc-file-line-missing-colon 
file.line state: add missing colon in docstring
 2016-01-25 09:37:38 -07:00
Nicole Thomas
afdbb745c6 Merge pull request #30581 from JacobCWard/develop 
Fixes #30569
 2016-01-25 09:36:03 -07:00
Michael Alphonso
22f6009030 fixed 2016-01-25 11:25:01 -05:00
Michael Alphonso
7448cccc58 fixed 2016-01-25 11:23:48 -05:00
Nicole Thomas
a7ba2df5e2 Merge pull request #30589 from terminalmage/2015.5-2015.8 
Merge 2015.5 into 2015.8
 2016-01-25 09:20:41 -07:00
EYJ
27ecac04a0 Fix credentials passing in boto_ec2.snapshot_created 2016-01-25 17:18:46 +01:00