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
William Huba
f9c05e73a7
Pass filepointers to the serialize load functions.
2015-09-15 16:17:27 -04: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
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
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
d3ba23e304
Merge pull request #27132 from DSRCompany/bugfix/27108_executor_args_typeerror
...
Fix #27108 : TypeError in direct_call executor if kwargs include "opts"
2015-09-15 08:34:33 -06:00
Mike Place
1be887628e
Merge pull request #26846 from douardda/patch-2
...
add -oIdentitiesOnly=yes to the ssh command line
2015-09-15 08:33:56 -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
Bo Maryniuk
b60e6a37a7
Lintfix: E7801, C0321
2015-09-15 16:08:05 +02:00
Bo Maryniuk
cb4706c7e8
Add license extraction for Dpkg.
2015-09-15 16:08:04 +02:00
Bo Maryniuk
38753fe8b2
Enhance filter for the "technical" fields that are not generally needed as a package information for the CMDB
2015-09-15 16:08:04 +02:00
Bo Maryniuk
ffe8f14dae
Implement additional package information merger
2015-09-15 16:08:04 +02:00
Bo Maryniuk
2aafc469d0
Fix the size and installed-size keys
2015-09-15 16:08:04 +02:00
Bo Maryniuk
3fc389435b
Add homepage translator key
2015-09-15 16:08:04 +02:00
Bo Maryniuk
25040c9c71
Docfix
2015-09-15 16:08:04 +02:00
Bo Maryniuk
911bae1baf
Add alias for 'info' of deprecation in v. Boron
2015-09-15 16:08:04 +02:00
Bo Maryniuk
306958dad0
Fix renamed method
2015-09-15 16:08:04 +02:00
Bo Maryniuk
6ba269fbc6
Remove 'N/A' when no data.
2015-09-15 16:08:04 +02:00
Bo Maryniuk
137eb75ca2
Rename existing 'info' to 'info_available'
2015-09-15 16:08:04 +02:00
Bo Maryniuk
7b376fd5c3
Implement compatible 'info_installed'. Returned keys are common to other systems with other package managers
2015-09-15 16:08:04 +02:00
Bo Maryniuk
ca7d0d5025
Implement compatible 'info_installed'. Returned keys are common to other systems with other package managers
2015-09-15 16:08:04 +02:00
Bo Maryniuk
c1faebf0b5
Implement compatible 'info_installed'. Returned keys are common to other systems with other package managers
2015-09-15 16:08:04 +02:00
Bo Maryniuk
f14f4036df
Lint: regexp as a string
2015-09-15 16:08:04 +02:00
Bo Maryniuk
cabe863b81
Implement package info function
2015-09-15 16:08:04 +02:00
Bo Maryniuk
0668f1da53
Implement getting package installation time
2015-09-15 16:08:04 +02:00
Bo Maryniuk
e03716e5b5
Implement getting general packages information
2015-09-15 16:08:04 +02:00
Bo Maryniuk
8737d690fe
Extract package description
2015-09-15 16:08:04 +02:00
Bo Maryniuk
a283d53737
Lintfix the regexp string
2015-09-15 16:08:03 +02:00
Bo Maryniuk
fc9c959678
Convert time to ISO 8601
2015-09-15 16:08:03 +02:00
Bo Maryniuk
9fb9296276
Return a detailed information about package(s)
2015-09-15 16:08:03 +02:00
jacobhammons
7483556b5f
Merge pull request #27131 from jacobhammons/install-docs
...
Install docs
2015-09-15 06:34:38 -06:00
Jacob Hammons
d1e8af9be6
added command to remove key from rhel6
2015-09-15 06:33:08 -06:00
Dmitry Kuzmenko
100292d9c8
Fix #27108 : TypeError in direct_call executor if kwargs include "opts"
...
Pass function arguments to executor as a collections not as executor args.
2015-09-15 15:32:10 +03:00