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
57,747 Commits 24 Branches 182 Tags 341 MiB
1a32b9f778
Commit Graph

57747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
1a32b9f778 Merge pull request #27254 from jfindlay/version.2015.8 
2015.2,2015.8,Beryllium -> 2015.8.0
 2015-09-18 17:44:46 -06:00
Justin Findlay
8ea15f498e 2015.2,2015.8,Beryllium -> 2015.8.0 
Some features were erroneously reported as being added in 2015.2.
 2015-09-18 16:35:15 -06:00
Mike Place
f3a847823b Merge pull request #27245 from rallytime/fix-25079 
If two ssh keynames are found in DigitalOcean, abort and warn the user.
 2015-09-18 15:42:36 -06:00
Mike Place
e4a5b004ae Merge pull request #27241 from jfindlay/yumwarn 
osrelease is only an integer for fedora
 2015-09-18 15:40:50 -06:00
Justin Findlay
f8e71f6d7d Merge pull request #27234 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-18 14:41:38 -06:00
Justin Findlay
2d6c75cbd7 Merge pull request #27240 from isbm/isbm-pkg.info-tz-bugfix-backport-2015.8 
Backport of the fix of 'pkg.info*' for Beryllium
 2015-09-18 14:02:15 -06:00
Justin Findlay
80a45b74ed Merge pull request #27223 from M2Mobi/zone 
Support firewalld per interface zone config on rh7 systems
 2015-09-18 13:44:45 -06:00
Colton Myers
652b2998af Merge pull request #27238 from bechtoldt/fix_disk_percent_keyerror 
salt.modules.disk.percent() throws KeyError when partition doesn't exist
 2015-09-18 13:37:00 -06:00
rallytime
4b0f7cce1d If two ssh keynames are found in DigitalOcean, abort. 
Fixes #25079
 2015-09-18 13:18:40 -06:00
Justin Findlay
1f7570250f osrelease is only an integer for fedora 
Fixes #27065.
 2015-09-18 12:50:47 -06:00
Arnold Bechtoldt
0511f611bb prevent KeyError by checking whether partition even exists 2015-09-18 19:47:23 +02:00
Bo Maryniuk
19a361851a Return install date only if possible. 2015-09-18 19:25:39 +02:00
Bo Maryniuk
ff857bc8aa Return RPM package time in UTC timezone 2015-09-18 19:21:12 +02:00
Bo Maryniuk
eaa0f370bf Remove time fraction and return ISO in UTC 2015-09-18 19:21:05 +02:00
Bo Maryniuk
ce9570fce6 Return UTC timestamp for modification of path. 2015-09-18 19:20:58 +02:00
Colton Myers
be2b0fc497 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/utils/http.py
 2015-09-18 10:57:28 -06:00
Colton Myers
579f375f74 Merge pull request #27233 from basepi/release.notes.stubs 
[2015.5] Add stub release notes for 2015.5.6
 2015-09-18 10:55:40 -06:00
Colton Myers
f4563ea9b7 Add stub release notes for 2015.5.6 2015-09-18 10:54:15 -06:00
Colton Myers
253ac5e0c3 Merge pull request #27232 from basepi/release.notes.stubs 
[2015.8] Add stub release notes for 2015.8.1
 2015-09-18 10:53:01 -06:00
Colton Myers
25410706ee Add stub release notes for 2015.8.1 2015-09-18 10:51:54 -06:00
Colton Myers
f5a322e3f2 Merge pull request #27208 from basepi/nop.state.25423 
[2015.5] Add test.nop state
 2015-09-18 10:50:17 -06:00
Colton Myers
9414b05b2c Add test.nop example 2015-09-18 10:49:45 -06:00
Mike Place
59a07cae68 Merge pull request #27201 from jfindlay/sshhash 
rename hash_hostname to hash_known_hosts
 2015-09-18 09:45:03 -06:00
Mike Place
c542cd49d0 Merge pull request #27199 from rallytime/fix-24573 
Avoid RunTimeError (dictionary changed size during iteration) with keys()
 2015-09-18 09:44:27 -06:00
Mike Place
560545c4c5 Merge pull request #27214 from jacksontj/2015.5 
Correctly support https, port 443 is not a requirement
 2015-09-18 09:43:05 -06:00
Joseph Hall
6b79ad69a9 Merge pull request #27206 from rallytime/gce-doc-cleanup 
Don't repeat GCE setup instructions, and make the use of .json files clearer
 2015-09-18 08:38:39 -06:00
Joseph Hall
1d022eb5de Merge pull request #27210 from rallytime/do-clean-up 
Refactor some digital ocean functions
 2015-09-18 08:38:01 -06:00
Heinz Wiesinger
48023669e7 Support permanent per interface firewalld zone configuration on rh7 systems. 
Fixes #27222
 2015-09-18 14:17:08 +02:00
Thomas Jackson
e7526bdb44 Correctly support https, port 443 is not a requirement 2015-09-17 19:05:10 -07:00
rallytime
808a5b3b81 Make sure we set the full data to the ret variable 2015-09-17 17:54:09 -06:00
rallytime
9b635004e2 Refactor some digital_ocean functions to help simplify the driver 2015-09-17 17:36:28 -06:00
Colton Myers
a84ce67b8f Add test.nop state 
A no-op state that does nothing. Useful in conjunction with the `use`
requisite, or in templates which could otherwise be empty due to jinja
rendering

Unlike test.succeed_without_changes, takes **kwargs to be more flexible.

Also removed the test stuff from succeed_without_changes. If a state
doesn't make changes, its behavior should be identical whether in test
mode or not.
 2015-09-17 17:22:49 -06:00
rallytime
cced6e9031 Don't repeat GCE setup instructions, and make the use of .json files clearer 2015-09-17 15:07:49 -06:00
Colton Myers
8c204a45ab Merge pull request #27197 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-17 13:53:22 -06:00
Justin Findlay
1b620b77cd rename hash_host arg to hash_known_hosts 
Fixes #27187.
 2015-09-17 12:41:19 -06:00
Justin Findlay
12f14ae37c update hash_known_hosts docs in ssh module 2015-09-17 12:08:49 -06:00
Mike Place
430c48c5ea Merge pull request #27195 from jacobhammons/doc-build 
Fixed sphinx / latex build warnings and errors
 2015-09-17 11:28:37 -06:00
Mike Place
7a34c7742d Merge pull request #27172 from rallytime/bp-27150 
Back-port #27150 to 2015.5
 2015-09-17 11:25:51 -06:00
Mike Place
8f8e75c5ff Merge pull request #27182 from Awingu/2015.8 
fix restart_on_error
 2015-09-17 11:24:01 -06:00
rallytime
6b2a00e947 Avoid RunTimeError (dictionary changed size during iteration) with keys() 
Fixes #24573
 2015-09-17 11:08:08 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
Jacob Hammons
fad87e34a2 Fixed lint errors 2015-09-17 10:27:54 -06:00
Justin Findlay
e956d88f5f Merge pull request #27194 from rallytime/bp-27180 
Back-port #27180 to 2015.5
 2015-09-17 10:17:24 -06:00
Mike Place
97d2a5fddc Merge pull request #27163 from terminalmage/issue27093 
Workaround upstream tornado bug affecting redirects
 2015-09-17 10:09:01 -06:00
Jacob Hammons
e56f02b025 re-add cheatsheet do-over 2015-09-17 09:32:52 -06:00
Jacob Hammons
60a8330561 re-added cheatsheet.tex 2015-09-17 09:29:09 -06:00
Tanky Woo
327d343fef file copy ret result True if no change in test mode 2015-09-17 09:26:16 -06:00
Jacob Hammons
f7a9e25d52 Fixed sphinx / latex build warnings and errors 
Added missing modules to contents
 2015-09-17 09:23:24 -06:00
Colton Myers
a02d043309 Merge pull request #27176 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-09-17 09:00:40 -06:00
Bernard Kerckenaere
693b81f7e4 fix restart_on_error #27127 2015-09-17 09:52:31 +02:00