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

59165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Maryniuk
dba47ecaed Return UTC timestamp for modification of path. 2015-09-18 11:50:34 +02:00
Colton Myers
9ddc88c6ba Merge pull request #27198 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-17 15:33:15 -06:00
Justin Findlay
8b2cb330e3 Merge pull request #27203 from whiteinge/sphinx-apidoc-wrapper 
Add script to run sphinx-apidoc against our module directories
 2015-09-17 15:23:20 -06:00
Colton Myers
1cbfa06591 Remove heavily-mocked failing test 2015-09-17 14:38:05 -06:00
Seth House
fed627763b Add script to run sphinx-apidoc against our module directories 
The script itself is pretty inflexible so we're doing a little find &
sed trickery around it.
 2015-09-17 14:22:12 -06:00
Colton Myers
7f391a409c Fix lint 2015-09-17 13:52:24 -06:00
Mike Place
6747400e1c Merge pull request #27174 from tinyclues/26505_saltnado_improve_accept_support 
Improve support of Accept header in saltnado.
 2015-09-17 12:04:25 -06:00
Mike Place
3717330d04 Merge pull request #27192 from DSRCompany/issues/26885_salt_call_zmq_monitor_fix 
Correclty install zeromq ioloop.
 2015-09-17 11:26:18 -06:00
Colton Myers
26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
 2015-09-17 11:10:37 -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
Dmitry Kuzmenko
98a9ea5007 Correclty install zeromq ioloop. 2015-09-17 17:48:01 +03: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
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
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
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
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
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
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
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
6351a94d08 Merge config values from master.d/minion.d conf files 
Refs #18582
 2015-09-15 15:41:10 -06:00
William Huba
f9c05e73a7 Pass filepointers to the serialize load functions. 2015-09-15 16:17:27 -04:00
Mike Place
6de2c2a50c Better error checking 2015-09-15 13:00:06 -06:00
rallytime
3e8fcec48b Add show_all_categories function to softlayer_hw driver 2015-09-15 12:44:29 -06:00
FELD Boris
ef3b7ddc2d Fix lints 2015-09-15 20:29:18 +02: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
FELD Boris
b13f66ee4b Add support for CORS in saltnado. 
Add support for CORS and tests in RPC salt-api. The code was inspired by
https://github.com/globocom/tornado-cors.

Also add support for CORS in websocket. By adding some tests, I made
a small refactoring to make the websocket handler more easily testable.

Some documentation about CORS could be found here
https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
for reference.
 2015-09-15 18:52:44 +02:00
jacobhammons
b71de75c1c Merge pull request #27139 from jacobhammons/rhel-doc 
Updated key instruction on rhel7
 2015-09-15 10:06:14 -06:00
Sergey Kizunov
88913cc451 Port 'TCP' transport to work on Windows 
salt/transport/ipc.py:
- The 'socket_path' parameter may also be of type 'int'. If this is the
case, it will be used as the port for a tcp localhost connection.

salt/transport/tcp.py
- If opt['ipc_mode'] is 'tcp', then using
opts['tcp_master_publish_pull'] to get the port number to be used for
the tcp localhost connection. This is similar to the zeromq logic.
- In TCPReqServerChannel, moving socket creation from pre_fork to
post_fork. It isn't needed in pre_fork (the parent process doesn't
need to access it), and on Windows, then spawning a process, the
'socket' is not picklable. Making sure close() will still work in
both parent and child processes by initializing '_socket' to None and
closing only if it isn't None.
- Avoiding this error message that seems to always occur when
SaltMessageClient is destroyed:
'[ERROR   ] Future exception was never retrieved: StreamClosedError'
This may be related with issue #25718.
This happens because the logic is always waiting to read the next
message and the associated read future is marked 'StreamClosedError'
when the stream is closed.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-09-15 11:05:20 -05:00