valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
63,243 Commits 24 Branches 182 Tags 341 MiB
372de0c342
Commit Graph

63243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
abednarik
39be52858d modules.marathon: __virtual__ return err msg. 
Updated message in marathon  module when return False if is not used in proxy minions.
 2015-12-15 09:38:53 -03:00
Christophe Drevet-Droguet
766de39750 ssh client: remove lines before any RSTR in stdout/stderr 2015-12-15 13:18:53 +01:00
Christophe Drevet-Droguet
baf8e0436e strips stdout of every line before the last RSTR one 2015-12-15 13:18:53 +01:00
Christophe Drevet-Droguet
b2326a9623 ssh client: fix shim_cmd access denied 2015-12-15 13:16:14 +01:00
Jiri Kotlin
ed1109de36 salt.utils.fopen instead of python open 2015-12-15 10:28:22 +00:00
Umberto Nicoletti
dd2b7f9664 documentation: add versionadded to new functions 2015-12-15 07:40:16 +00:00
abednarik
566de2e079 modules.portage_config: __virtual__ return err msg. 
Updated message in portage_config module when return False if portage is not available or os
is not Gentto.
 2015-12-14 23:43:59 -03:00
abednarik
1aa749374d modules.lxc: __virtual__ return err msg. 
Updated message in lxc module when return False if lxc-start command is not available.
 2015-12-14 23:38:46 -03:00
Sergey Paramonov
f8be79102e Update user.py 2015-12-14 19:52:18 -05:00
Ethan Moore
58b567f0da Allow windows minion to run beacon 
add documentation to show usage for windows drive letters
 2015-12-15 00:29:19 +00:00
rallytime
17482d3c66 Deprecate htpasswd useradd_all in favor of useradd 
Fixes #29623

One function is just a wrapper for the other. There is no need to
have both, and having both is confusing, especially since the
documentation for both of these functions is the same.
 2015-12-14 16:31:05 -07:00
Colton Myers
5ac96cc8ba Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/tls.py
    salt/states/git.py
    salt/transport/tcp.py
 2015-12-14 15:56:26 -07:00
abednarik
bdf1824bd8 Added a note regarding logging configuration. 
Simple example on how to turn off logging.
 2015-12-14 17:26:40 -03:00
Mike Place
bbc10347eb Merge pull request #29679 from abednarik/virtual_ret_deb_apache_module 
modules.deb_apache: __virtual__ return err msg.
 2015-12-14 12:09:10 -07:00
Mike Place
aee995bbff Merge pull request #29677 from abednarik/virtual_ret_ddns_module 
modules.ddns: __virtual__ return err msg.
 2015-12-14 12:01:16 -07:00
Mike Place
0759ef52ba Merge pull request #29650 from dschaller/add-npm-verbose-option 
Adding ability to disable npm install silent flag
 2015-12-14 11:57:09 -07:00
Mike Place
fe0778dad5 Merge pull request #29644 from rallytime/esxi-fixes 
Fixed a couple more ESXi proxy minion bugs
 2015-12-14 11:36:28 -07:00
Mike Place
09e72decf4 Merge pull request #29676 from abednarik/updated_requirements_for_salt_development 
Updated documentation for Salt Development.
 2015-12-14 11:29:40 -07:00
abednarik
71f458aac2 modules.deb_postgres: __virtual__ return err msg. 
Updated message in deb_postgres module when return False if pg_createcluste command is not available.
 2015-12-14 15:28:39 -03:00