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
59,254 Commits 24 Branches 182 Tags 341 MiB
fc36164ddf
Commit Graph

59254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitry Kuzmenko
98a9ea5007 Correclty install zeromq ioloop. 2015-09-17 17:48:01 +03:00
Bernard Kerckenaere
693b81f7e4 fix restart_on_error #27127 2015-09-17 09:52:31 +02:00
Justin Findlay
d988aa2145 Merge pull request #27180 from tankywoo/file-copy-result-true-in-test 
file copy ret result True if no change in test mode
 2015-09-17 00:27:43 -06:00
Tanky Woo
8e3eecb03b file copy ret result True if no change in test mode 2015-09-17 13:29:56 +08: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
FELD Boris
5e9c3c7d96 Improve support of Accept header in saltnado. 
It currently supports 'simple' values like application/json, but Accept header
could also include more than one value with parameters
See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1.
For example:

```application/json, text/javascript, */*; q=0.01```

This PR add support for multiple media_range in Accept header, support parsing
of parameter (like q=0.01) but discard them and finally iterate on
media_range and take the first compatible.

A more complete implementation may fully supports the RFC and support
q parameter and specific order of priority to find the most compatible
Content-Type but I don't think it's worth the pain.

If we want a better implementation, werkzeug has actually an implementation
http://werkzeug.pocoo.org/docs/0.10/datastructures/#werkzeug.datastructures.Accept.best_match.
 2015-09-17 00:48:34 +02: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
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
Colton Myers
6c69077b7a Merge pull request #26924 from jodv/remove_dupe_auth 
remove extra call to time_auth from ClearFuncs
 2015-09-16 10:59:24 -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
Mike Place
690abc156d Merge pull request #27140 from skizunov/develop2 
Port 'TCP' transport to work on Windows
 2015-09-16 09:12:44 -06:00
Mike Place
47cf7f5a75 Merge pull request #27142 from tinyclues/26505_cors_support_saltnado 
Add support for CORS in saltnado. Ref #26505
 2015-09-16 09:09:08 -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
f966fc766d Merge pull request #27148 from hexedpackets/develop 
Pass file pointers to the serialize load functions.
 2015-09-16 09:05:18 -06:00
Mike Place
7fa45d671a Merge pull request #27145 from rallytime/softlayer_hw_categories 
Add show_all_categories function to softlayer_hw driver
 2015-09-16 09:04:11 -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
Mike Place
3c6a13a6de Merge pull request #27153 from twangboy/fix_23768 
Feature: Added cache_file parameter to pkg.install
 2015-09-16 09:01:16 -06:00
twangboy
b77b01fadd Fixed some lint 2015-09-15 23:07:09 -06:00
twangboy
3795396b72 Added cache_file parameter to pkg.install 2015-09-15 22:44:23 -06:00
twangboy
407f6a738c Added cache_file option 2015-09-15 17:45:33 -06:00