valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,751 Commits 24 Branches 182 Tags 341 MiB
b11ce6ac2a
Commit Graph

57751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joseph Hall
65c59ec2ea Merge pull request #27177 from rallytime/fix-19954 
Remove note - incorrect info
 2015-09-16 19:34:03 -06:00
rallytime
531b44243d Remove note - incorrect info 2015-09-16 19:30:03 -06:00
Colton Myers
66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    doc/conf.py
    salt/__init__.py
    salt/cli/__init__.py
 2015-09-16 18:39:16 -06:00
Joseph Hall
cbb7e7f1a5 Merge pull request #27173 from rallytime/fix-19954 
Add the ability to specify multiple disks on the SoftLayer driver
 2015-09-16 18:32:57 -06:00
rallytime
45c6aabde9 DeviceID '1' is reserved for the SWAP disk; let's skip it. 2015-09-16 17:24:30 -06:00
rallytime
54e104cf5b Don't stacktrace if local_disk isn't set 2015-09-16 17:07:41 -06:00
rallytime
fe74d203f5 Add the ability to specify multiple disks on the SoftLayer driver 
Refs #19954
 2015-09-16 16:46:02 -06:00
Joseph Hall
de2027426e Merge pull request #27170 from rallytime/gce-docs 
Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples
 2015-09-16 16:23:51 -06:00
Mike Place
0d7ee4b209 Merge config values from master.d/minion.d conf files 
Refs #18582
 2015-09-16 14:21:43 -06:00
Justin Findlay
28cfdfd067 Merge pull request #27167 from rallytime/bp-27148 
Back-port #27148 to 2015.5
 2015-09-16 13:56:01 -06:00
Nicole Thomas
4495f4f4d0 Merge pull request #27168 from techhat/gateimpacket 
Add further gating of impacket library
 2015-09-16 12:55:56 -06:00
Nicole Thomas
0e04588d58 Merge pull request #27164 from rallytime/add-26824-changes-to-2015.8 
Make sure changes from #26824 to digital_ocean_v2.py driver make it to digital_ocean.py in 2015.8
 2015-09-16 12:55:17 -06:00
rallytime
a07db909bd Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples 2015-09-16 12:51:47 -06:00
Joseph Hall
cc448bfdc1 Add further gating of impacket library 2015-09-16 11:54:49 -06:00
Joseph Hall
3e5ef0dc30 Merge pull request #27166 from rallytime/fix-27100 
Allow a full-query for EC2, even if there are no profiles defined
 2015-09-16 11:41:40 -06:00
William Huba
d12be52355 Pass filepointers to the serialize load functions. 2015-09-16 10:55:20 -06:00
rallytime
50fb3a489a Allow a full-query for EC2, even if there are no profiles defined 
Fixes #27100
 2015-09-16 10:48:17 -06:00
Mike Place
f1c9de7ed9 Merge pull request #27162 from rallytime/softlayer-service 
Be explicit in using "SoftLayer" for service queries in SoftLayer drivers
 2015-09-16 10:43:26 -06:00
Erik Johnson
80b396db73 Handle potential ValueError when checking content length 
This should never happen if the remote webserver is working properly,
but I'm paranoid and want to cover this corner case.
 2015-09-16 11:42:00 -05:00
Erik Johnson
a89c987943 Remove unused import 
This import was added during the implementation of
https://github.com/saltstack/salt/pull/27163, but that approach was
later scrapped.
 2015-09-16 11:42:00 -05:00
Erik Johnson
469e18f74c Workaround upstream tornado bug affecting redirects 
See the following:

- https://github.com/saltstack/salt/issues/27093#issuecomment-140155828
- https://github.com/tornadoweb/tornado/issues/1518
 2015-09-16 11:42:00 -05:00
Erik Johnson
f2a562ac60 Add salt.utils.files.rename() for cross-platform renaming 2015-09-16 11:42:00 -05:00
Erik Johnson
38d93a96fe Merge pull request #27143 from cachedout/clean_grains_cache_on_sync 
Clean grains cache on grains sync
 2015-09-16 11:27:06 -05:00
Mike Place
0a660a9f80 Break apart long line 2015-09-16 09:41:41 -06:00
Erik Johnson
626cbe61ce Merge pull request #27150 from cachedout/issue_18582 
Merge config values from master.d/minion.d conf files
 2015-09-16 10:36:41 -05:00
rallytime
a44bd763dd Make sure changes from #26824 to digital_ocean_v2.py driver make it to digital_ocean.py in 2015.8 2015-09-16 09:22:35 -06:00
rallytime
d281068c70 Be explicit in using "SoftLayer" for service queries in SoftLayer drivers 2015-09-16 09:07:24 -06:00
Mike Place
59e9dfd8de Merge pull request #27149 from twangboy/fix_27133 
Fixed problem with add/remove path
 2015-09-16 09:01:48 -06:00
twangboy
7992b7e20a Fixed some tests... hopefully... 2015-09-15 16:27:47 -06:00
Mike Place
72fad569b0 Merge pull request #27137 from jfindlay/serial 
revert serial grain regression
 2015-09-15 15:52:25 -06:00
Mike Place
58b56b9d78 Merge pull request #27144 from rallytime/softlayer-fixes 
Don't stacktrace on softlayer_hw.show_all_prices if a code isn't supplied
 2015-09-15 15:52:09 -06:00
Mike Place
097fcd1017 Merge pull request #27147 from rallytime/fix-11669 
Enforce bounds in the GCE Regex
 2015-09-15 15:51:55 -06:00
Mike Place
6351a94d08 Merge config values from master.d/minion.d conf files 
Refs #18582
 2015-09-15 15:41:10 -06:00
twangboy
d4c8e30f5d Fixed problem with add/remove path 2015-09-15 15:36:51 -06:00
rallytime
55312ea03f Provide a more friendly error message. 2015-09-15 14:10:56 -06:00
rallytime
36555856c7 Enforce bounds in the GCE Regex 
Otherwise we only match on the first part of the string, allowing minion names with "dots" on them.

Fixes #11669
 2015-09-15 14:02:47 -06:00
Mike Place
6de2c2a50c Better error checking 2015-09-15 13:00:06 -06:00
rallytime
3963a5cf0f Don't stacktrace on softlayer_hw.show_all_prices if a code isn't supplied 2015-09-15 11:44:55 -06:00
Mike Place
252f7c7ea9 Clean grains cache on grains sync 
Closes #19853
 2015-09-15 11:33:01 -06:00
jacobhammons
b71de75c1c Merge pull request #27139 from jacobhammons/rhel-doc 
Updated key instruction on rhel7
 2015-09-15 10:06:14 -06:00
Jacob Hammons
7ed9f6260f Updated key instruction on rhel7 2015-09-15 10:04:57 -06:00
Mike Place
0d8248930e Merge pull request #27134 from isbm/isbm-pkg.info-backport-2015.8 
Backport to 2015.8: "pkg.info"
 2015-09-15 09:57:46 -06:00
Justin Findlay
78c9687f0e revert serial grain regression 
Introduced in #22267; fixes #27135.
 2015-09-15 09:54:00 -06:00
Mike Place
f5c3f157dd Merge pull request #27128 from eguven/2015.5-fix-test-diff 
don't show diff for test run if show_diff=False
 2015-09-15 08:11:55 -06:00
Mike Place
7f512852ef Merge pull request #27119 from l2ol33rt/boto_dynamo_module_fix 
Boto dynamodb module should be using layer 2 abstractions
 2015-09-15 08:09:57 -06:00
Mike Place
100e340111 Merge pull request #27092 from perfinion/chdir-fix-2015.8 
salt/master: chdir to root not homedir
 2015-09-15 08:09:24 -06:00