Commit Graph

63364 Commits

Author SHA1 Message Date
Mike Place
4470aefd90 Merge pull request #29749 from abednarik/virtual_ret_win_ip_module
modules.win_ip: __virtual__ return err msg.
2015-12-16 07:38:48 -07:00
Mike Place
cae625f818 Merge pull request #29750 from abednarik/virtual_ret_win_groupadd_module
modules.win_groupadd: __virtual__ return err msg.
2015-12-16 07:38:30 -07:00
Mike Place
be3c86c4c0 Merge pull request #29745 from abednarik/virtual_ret_win_pkg_module
modules.win_pkg: __virtual__ return err msg.
2015-12-16 07:38:06 -07:00
abednarik
23362e8b53 modules.win_groupadd: __virtual__ return err msg.
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 10:06:02 -03:00
abednarik
068de3d561 modules.win_ip: __virtual__ return err msg.
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 10:03:19 -03:00
abednarik
fb95e2b7cd modules.win_network: __virtual__ return err msg.
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 10:01:45 -03:00
abednarik
bf958b2b1f modules.win_ntp: __virtual__ return err msg.
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 09:58:59 -03:00
abednarik
21e3186e01 modules.win_path: __virtual__ return err msg.
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 09:56:31 -03:00
abednarik
9cf4b4670e modules.win_pkg: __virtual__ return err msg.
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 09:54:10 -03:00
Mathieu Le Marec - Pasquet
b25b34474a Fix #29742: vgname is lost in the middle 2015-12-16 13:42:27 +01:00
Mathieu Le Marec - Pasquet
3c4185f806 Type mess in git.latest
Did not get why, but we can have a list of comments instead of stings.

This fixes:
```
     line 107, in _uptodate\n    ret['comment'] += '\\n\\nChanges made: ' + comments\nTypeError:
      cannot concatenate 'str' and 'list' objects\n"
    duration: 366.804
    name: https://github.com/makinacorpus/makina-states.git
    result: false
```
2015-12-16 12:59:55 +01:00
abednarik
8f4f5b3361 modules.win_service: __virtual__ return err msg.
Updated messafe when return Falso on __virtual__ when system is not Windows.
2015-12-16 08:31:37 -03:00
Mathieu Le Marec - Pasquet
944a80cc2a Retrocompat fix for #29735: pkg.latest/wait
This refs & fix salstack/salt#29735
2015-12-16 11:31:07 +00:00
Simon A. Eugster
0ca82f27b8 Doc update on masterless mode: Move master config to minion config 2015-12-16 10:59:14 +01:00
Lv Jiawei
49a2d6fc0a Update neutron.py 2015-12-16 09:27:57 +08:00
Tarjei Husøy
387ac2ce5e Support match-sets in iptables module
Based on work by @l13t in https://github.com/saltstack/salt/pull/29426.

Added tests and fixed incorrect appending of the built rule.

Closes #29423.
2015-12-15 16:35:06 -08:00
Mike Place
f1e1b31c82 Merge pull request #29728 from pzipoy/dev/pzipoy/windows_dropfile_exist
Check for windows dropfile existence
2015-12-15 16:58:28 -07:00
Mike Place
2b06b22e33 Merge pull request #29717 from jraby/patch-1
Document syslog facility format and default value
2015-12-15 16:04:13 -07:00
Mike Place
31e195dd68 Merge pull request #29720 from s-sebastian/develop
Remove humanname from yum repository options
2015-12-15 16:01:54 -07:00
Mike Place
1ad06593a2 Merge pull request #29725 from cachedout/disable_moto
Disable some boto tests per resolution of moto issue
2015-12-15 14:59:59 -07:00
Mike Place
a2b1f41f49 Disable some boto tests per resolution of moto issue
Pending resolution of https://github.com/spulec/moto/issues/493
2015-12-15 14:57:52 -07:00
Perry Zipoy
ea4cfd7a16 Check for windows dropfile existence
This will check the existence of the .dfn dropfile before attempting to
change its permissions to avoid the exception, "The system cannot find
the file specified" in the case when the file does not exist.

Signed-off-by: Perry Zipoy <perry.zipoy@ni.com>
2015-12-15 15:49:51 -06:00
Sebastian Sobczynski
c5e80bc546 Remove humanname from yum repository options 2015-12-15 20:12:40 +00:00
gqgunhed
fc0caa7209 fixed: include all items from kern.disks split
salt['grains.get']('disks') always dropped the last disk (first in returned list from sysctl).
"sysctl -n" does not include sysctl-name, so the [1:] offset was wrong.
2015-12-15 21:00:48 +01:00
jraby
296de21056 Document syslog facility format and default value 2015-12-15 14:56:13 -05:00
Mike Place
5a476c5dc3 Merge pull request #29669 from jirikotlin/develop
checkrestart functionality
2015-12-15 12:17:00 -07:00
Mike Place
c1f3d9ba5a Merge pull request #29706 from bradthurber/jboss-modules-updates
Jboss module minor updates
2015-12-15 12:16:04 -07:00
Joseph Hall
bda1723fb4 More lint 2015-12-15 12:12:10 -07:00
Mike Place
69daaa58a0 Merge pull request #29647 from serge-p/patch-4
Update user.py
2015-12-15 11:59:21 -07:00
Mike Place
1c6e896edb Merge pull request #29655 from abednarik/disable_log_doc_update
Added a note regarding logging configuration.
2015-12-15 11:50:05 -07:00
Colton Myers
832870264a Merge pull request #29702 from dr4Ke/fix_ssh_shim_local_temp_access_denied
ssh client: fix shim_cmd access denied
2015-12-15 11:38:04 -07:00
Mike Place
998ba2eaa7 Merge pull request #29680 from abednarik/virtual_ret_deb_postgresql_module
modules.deb_postgres: __virtual__ return err msg.
2015-12-15 11:37:50 -07:00
Colton Myers
365bee5e45 Merge pull request #29703 from dr4Ke/fix_ssh_shim_RSTR_twice_in_stdout
Fix ssh shim rstr twice in stdout
2015-12-15 11:34:32 -07:00
Mike Place
0d2b37ac0a Merge pull request #29688 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-12-15 11:33:23 -07:00
Mike Place
e8259b4380 Merge pull request #29689 from rallytime/fix-29623
Deprecate htpasswd useradd_all in favor of useradd
2015-12-15 11:32:47 -07:00
Mike Place
7cba3c1c87 Merge pull request #29696 from abednarik/virtual_ret_portage_config_module
modules.portage_config: __virtual__ return err msg.
2015-12-15 11:28:57 -07:00
Mike Place
d571565613 Merge pull request #29692 from lomeroe/diskusage_beacon_windows
Allow windows minion to run beacon
2015-12-15 11:19:34 -07:00
Joseph Hall
6015b4d679 Linting 2015-12-15 11:16:46 -07:00
Mike Place
bda30153b5 Merge pull request #29710 from techhat/imgconvert
Add qemu_img.convert
2015-12-15 11:06:09 -07:00
Joseph Hall
26938bda58 Add genesis.mksls 2015-12-15 10:35:00 -07:00
Brad Thurber
19924522d6 fix whitespace lint 2015-12-15 12:08:52 -05:00
Joseph Hall
fbf0b52ad7 Add qemu_img.convert 2015-12-15 09:36:48 -07:00
Mike Place
270cb55c15 Merge pull request #29695 from abednarik/virtual_ret_lxc_module
modules.lxc: __virtual__ return err msg.
2015-12-15 09:25:26 -07:00
Mike Place
0e9477286c Merge pull request #29704 from abednarik/virtual_ret_marathon_module
modules.marathon: __virtual__ return err msg.
2015-12-15 09:24:58 -07:00
Mike Place
c6fb645ddb Merge pull request #29705 from abednarik/virtual_ret_mod_randon_module
modules.random: __virtual__ return err msg.
2015-12-15 09:23:45 -07:00
Nicole Thomas
917f1d3a84 Merge pull request #29709 from rallytime/merge-29653
Merge #29653 with pylint fix
2015-12-15 09:23:14 -07:00
rallytime
aebad05e18 Pylint for #29653
Refs #29653
2015-12-15 09:22:17 -07:00
Ethan Moore
78a5a6a7eb removing unused import to make lint happy 2015-12-15 15:54:54 +00:00
Brad Thurber
baf36b055b simplify profile/no profile logic to avoid repetition, add additional "LONG" datatype token, return stdout in cli_result as some state error messages depend on it being there 2015-12-15 08:53:36 -05:00
abednarik
fca9fce511 modules.random: __virtual__ return err msg.
Updated message in mod_random module when return False if Python version is not 2.7 or higher.
2015-12-15 10:00:59 -03:00