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
50,140 Commits 24 Branches 182 Tags 341 MiB
458a544d83
Commit Graph

50140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
1b620b77cd rename hash_host arg to hash_known_hosts 
Fixes #27187.
 2015-09-17 12:41:19 -06:00
Justin Findlay
12f14ae37c update hash_known_hosts docs in ssh module 2015-09-17 12:08:49 -06:00
Mike Place
7a34c7742d Merge pull request #27172 from rallytime/bp-27150 
Back-port #27150 to 2015.5
 2015-09-17 11:25:51 -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
Tanky Woo
327d343fef file copy ret result True if no change in test mode 2015-09-17 09:26:16 -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
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
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
Mike Place
0d7ee4b209 Merge config values from master.d/minion.d conf files 
Refs #18582
 2015-09-16 14:21:43 -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
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
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
rallytime
d281068c70 Be explicit in using "SoftLayer" for service queries in SoftLayer drivers 2015-09-16 09:07:24 -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
twangboy
7992b7e20a Fixed some tests... hopefully... 2015-09-15 16:27:47 -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
twangboy
d4c8e30f5d Fixed problem with add/remove path 2015-09-15 15:36:51 -06: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
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
Eren Güven
ec2d68a84a don't show diff for test run if show_diff=False 2015-09-15 12:43:44 +02:00
Justin Findlay
c186e51764 Merge pull request #27117 from jacobhammons/release-docs-2014.7 
made 2014.7 an archived release
 2015-09-15 01:35:12 -06:00
Justin Findlay
088b1dbb3e Merge pull request #27116 from jacobhammons/release-docs-2015.5 
Update latest to 2015.8, 2015.5 is now previous
 2015-09-15 01:34:27 -06:00
Justin Findlay
440855b182 Merge pull request #27033 from jfindlay/n0ne 
Merge #27019
 2015-09-15 01:32:17 -06:00
Justin Findlay
69d758ee2b Merge pull request #27114 from cachedout/warn_on_insecure_log 
Issue warning that some log levels may contain sensitive data
 2015-09-15 01:30:43 -06:00
Jacob Hammons
b69e11e0a4 made 2014.7 an archived release 
minor doc site updates
 2015-09-14 16:43:51 -06:00
Jacob Hammons
6e323b6dd3 Update latest to 2015.8, 2015.5 is now previous 
Assorted style and minor updates
 2015-09-14 16:32:22 -06:00
Justin Findlay
3334b9d548 fix comment and unit test for reg state 2015-09-14 16:04:09 -06:00
Mike Place
507fb04683 Issue warning that some log levels may contain sensitive data 2015-09-14 15:39:17 -06:00
Mike Place
aa71bae8aa Merge pull request #27075 from twangboy/fix_password_2014.7 
Replaced password with redacted when displayed
 2015-09-14 12:36:10 -06:00
Mike Place
35fc74132a Merge pull request #26942 from Arabus/fix-docker.run 
Fix docker.run
 2015-09-14 12:10:53 -06:00
Mike Place
59f2a0c7ae Merge pull request #26977 from abh/2015.5-ntppeer 
Add support for PEERNTP network interface configuration
 2015-09-14 11:59:00 -06:00
Mike Place
e05b1f3951 Merge pull request #27023 from jfindlay/htwebutilpass 
add test support for htpasswd state mod
 2015-09-14 11:48:00 -06:00
Mike Place
9f999c0027 Merge pull request #27074 from twangboy/fix_password_2015.5 
Replaced password with redacted when displayed
 2015-09-14 10:27:26 -06:00
Justin Findlay
46b44f85ed Merge pull request #27073 from rallytime/remove-lxc-warning 
Remove "use develop branch" warning from LXC tutorial
 2015-09-11 17:51:06 -06:00
twangboy
c0689e3215 Replaced password with redacted when displayed 2015-09-11 16:48:21 -06:00
twangboy
fdd3537456 Replaced password with redacted when displayed 2015-09-11 16:39:47 -06:00
Justin Findlay
caab21d99c Merge pull request #27054 from rallytime/bp-27029 
Back-port #27029 to 2015.5
 2015-09-11 16:29:45 -06:00
Justin Findlay
0227e1cb57 Merge pull request #27053 from rallytime/bp-26992 
Back-port #26992 to 2015.5
 2015-09-11 16:29:30 -06:00
Justin Findlay
b72a0ef86d Merge pull request #27052 from rallytime/bp-26930 
Back-port #26930 to 2015.5
 2015-09-11 16:28:11 -06:00
Justin Findlay
8b554dd16f Merge pull request #27049 from johanek/repoquery-dedupe 
Run repoquery less
 2015-09-11 16:26:12 -06:00
rallytime
76c056d02b Remove "use develop branch" warning from LXC tutorial now that 2015.5.0 has been released 2015-09-11 16:05:28 -06:00
Joseph Hall
cc2cbf9869 Merge pull request #27070 from stanislavb/2015.5 
Deprecate salt.utils.iam in Carbon
 2015-09-11 16:01:57 -06:00
Stanislav Blokhin
1e6e5ddc9c Deprecate salt.utils.iam in Carbon 
salt.utils.aws has more feature complete methods to retrieve same data
 2015-09-11 22:35:09 +02:00
Nicholas Caley
0be393be22 Removed check for no package name 
When a pkg name is not specified, this should just run `npm install --json`. The check that was removed prevented this from happening and also prevented the 'npm.bootstrap' state from working correctly.
 2015-09-11 09:20:31 -06:00