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
56,445 Commits 24 Branches 182 Tags 341 MiB
0fc16040d6
Commit Graph

56445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
0fc16040d6 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/__init__.py
    salt/cloud/clouds/vmware.py
    salt/loader.py
    salt/minion.py
    salt/modules/archive.py
    salt/modules/file.py
    salt/states/pkg.py
    salt/utils/http.py
 2015-08-10 13:21:57 -06:00
Nicole Thomas
ef5a4a47f6 Merge pull request #26172 from nmadhok/backport-cloud-fix-26163-2015.5 
[Backport] Make sure variable is a dictionary before popping something from it.
 2015-08-10 10:42:50 -06:00
Mike Place
a547eaf672 Merge pull request #26169 from terminalmage/issue26149 
Fix attribute error in gitfs' find_file functions
 2015-08-10 10:34:12 -06:00
Nicole Thomas
151acabdca Merge pull request #26170 from nmadhok/backport-cloud-fix-26163-2015.8 
[Backport] Make sure variable is a dictionary before popping something from it.
 2015-08-10 10:25:03 -06:00
Nicole Thomas
22705c5222 Merge pull request #26143 from nmadhok/vmware-cloud-fixes-2015.8 
VMware cloud driver fixes [forward port from 2015.5 into 2015.8]
 2015-08-10 10:17:59 -06:00
Nicole Thomas
883bd060f7 Merge pull request #26173 from jacobhammons/cloud-driver-docs 
Updates to cloud docs for the provider > driver change
 2015-08-10 10:15:44 -06:00
Jacob Hammons
d8d5045d3b Updates to cloud docs for the provider > driver change in provider configs. 
Refs #24797
 2015-08-10 09:20:26 -06:00
Nitin Madhok
0f2b5f8ac8 Make sure variable is a dictionary before popping something from it. 2015-08-10 11:14:18 -04:00
Erik Johnson
2bef1db9f5 Fix attribute error in gitfs' find_file functions 
Resolves #26149, thanks very much to @TronPaul for the investigative
work here.
 2015-08-10 10:07:55 -05:00
Nitin Madhok
cd4faace82 Make sure variable is a dictionary before popping something from it. 2015-08-10 11:06:34 -04:00
Mike Place
2545df052a Merge pull request #26168 from cachedout/fix_slack_docs 
Fix slack docs
 2015-08-10 08:57:18 -06:00
Mike Place
f421a936dc Fix slack docs 
Closes #26098
 2015-08-10 08:56:42 -06:00
Mike Place
2704094e21 Merge pull request #26125 from evverx/timedatectl-settz 
Use timedatectl set-timezone to tzsetting if available
 2015-08-10 08:43:41 -06:00
Mike Place
9e6b0d6165 Merge pull request #26127 from garethgreenaway/2015_5_24106 
Fixes to salt.utils.http related to cp.get_file_str bug.
 2015-08-10 08:38:25 -06:00
Mike Place
5eda47aa84 Merge pull request #26145 from sjorge/imgadm-output-cleanup 
smartos_imgadm cleanup
 2015-08-10 08:32:21 -06:00
Mike Place
95a560ebf1 Merge pull request #26148 from terminalmage/winrepo 
Refactor winrepo support
 2015-08-10 08:31:25 -06:00
Mike Place
3b65e1dd91 Merge pull request #26140 from nmadhok/vmware-cloud-fixes 
VMware cloud driver fixes
 2015-08-10 07:15:58 -06:00
Erik Johnson
56798d724c Fix comment in return value 2015-08-09 22:07:02 -05:00
Erik Johnson
8f552cda23 Get winrepo opts from master config, not minion opts 2015-08-09 22:06:34 -05:00
Erik Johnson
18ebdd382a Update winrepo tests with new param names 2015-08-09 21:19:45 -05:00
Erik Johnson
01a2742f72 Remove unused import 2015-08-09 20:47:25 -05:00
Gareth J. Greenaway
66f640086a one more lint error 2015-08-09 17:52:48 -07:00
Erik Johnson
d2d30bdb4a Move winrepo root definition into GitProvider class 2015-08-09 17:42:13 -05:00
Erik Johnson
67a60e2228 Correct a bad link 2015-08-09 17:42:13 -05:00
Erik Johnson
b9fa443eba Update release notes with more information about winrepo changes 2015-08-09 17:42:13 -05:00
Erik Johnson
a7623b73ee Add notes about new features and deprecated option names 2015-08-09 17:42:13 -05:00
Erik Johnson
157b1c8b11 Add masterless winrepo config params to minion config docs 2015-08-09 17:42:13 -05:00
Erik Johnson
7ed679ad60 Add new winrepo config params to master config docs 
Also fixed documentation for some of the gitfs and git_pillar config
params.
 2015-08-09 17:42:13 -05:00
Erik Johnson
a7f9622486 Deprecate old winrepo config params in salt.modules.win_pkg 2015-08-09 17:42:12 -05:00
Erik Johnson
ba622cd5b0 Rename config parameters to reflect name changes 2015-08-09 17:42:12 -05:00
Erik Johnson
b7747d47d1 Deprecate old winrepo config params in salt.modules.winrepo 
Also corrected bad path handling in genrepo()
 2015-08-09 17:42:12 -05:00
Erik Johnson
b5c5a4728f Deprecate old winrepo config params in salt.runners.winrepo 
Also made a couple bugfixes found in testing
 2015-08-09 17:42:12 -05:00
Erik Johnson
bc0832cd12 Deprecate old winrepo config params in salt.states.winrepo 2015-08-09 17:42:12 -05:00
Erik Johnson
692d96e9d2 Deprecate old winrepo config params in salt.utils.gitfs 2015-08-09 17:42:12 -05:00
Erik Johnson
f5fd2729c2 Add ref to winrepo docs 2015-08-09 17:42:12 -05:00
Erik Johnson
caab015fba Use platform agnostic path joiner when caching files 2015-08-09 17:42:12 -05:00
Erik Johnson
3107c6c6ca Quiet down logging for winrepo 2015-08-09 17:42:12 -05:00
Erik Johnson
ea3549e43e Use salt.utils.gitfs for winrepo 2015-08-09 17:42:12 -05:00
Erik Johnson
c7666117a8 Make minimum gitpython, pygit2, etc. versions global attributes 2015-08-09 17:42:12 -05:00
Erik Johnson
d84d13adcc Add WinRepo class 2015-08-09 17:42:12 -05:00
Erik Johnson
f1c087896e Add new winrepo config params 2015-08-09 17:42:12 -05:00
Nitin Madhok
a1899b436c Correct provider name in profile example 2015-08-09 11:49:10 -04:00
Nitin Madhok
194f2b9ba7 Correct provider name in profile example 2015-08-09 11:48:04 -04:00
Nitin Madhok
b699e0cf47 Change all provider references to driver 2015-08-09 11:47:14 -04:00
Nitin Madhok
d6ed38c6a9 backwards compatibility fix for mac_address 2015-08-09 11:33:00 -04:00
Jorge Schrauwen
b1eb882585 salt.modules.smartos_imgadm - fix incorrect parsing of message on delete 2015-08-09 13:01:46 +00:00
Jorge Schrauwen
22d95456c0 salt.modeles.smartos_imgadm - ling cleanup 2015-08-09 12:36:50 +00:00
Jorge Schrauwen
3e71a6924f salt.modeles.smartos_imgadm - use __func_alias__ consitently to avoid clobbering python internal functions. 2015-08-09 12:36:06 +00:00
Jorge Schrauwen
30e6a812de Merge branch 'imgadm-output-cleanup' of https://github.com/sjorge/salt into imgadm-output-cleanup 2015-08-09 12:32:17 +00:00
Jorge Schrauwen
96e7a19b96 salt.modules.smartos_imgadm - renamed import_image to import, now inline with underlaying imgadm update. Also returns proper output. 2015-08-09 12:31:53 +00:00