Justin Findlay
e36c019c37
Merge pull request #27277 from rallytime/bp-27230
...
Back-port #27230 to 2015.5
2015-09-21 13:06:13 -06:00
Ben Hosmer
3ce77db1bc
Fix typo in AWS doc config
2015-09-21 09:36:46 -06:00
Justin Findlay
b22286476e
Merge pull request #27253 from jfindlay/version.2015.5
...
2015.5 -> 2015.5.0
2015-09-18 17:44:43 -06:00
Justin Findlay
967e3bb72a
2015.5 -> 2015.5.0
2015-09-18 16:27:02 -06:00
Mike Place
51a0193b54
Merge pull request #27244 from garethgreenaway/ec2_create_snapshot_no_return_data_exception
...
Exception in cloud.ec2.create_snapshot
2015-09-18 15:41:11 -06:00
Gareth J. Greenaway
820fd576b9
Fixing the cause when the r_data from aws.query is empty and an exception happens when looking for the snapshotID
2015-09-18 12:21:36 -07:00
Mike Place
26540f15bc
Merge pull request #27231 from jfindlay/cronchange
...
only write cron file if it is changed
2015-09-18 12:23:09 -06:00
Colton Myers
579f375f74
Merge pull request #27233 from basepi/release.notes.stubs
...
[2015.5] Add stub release notes for 2015.5.6
2015-09-18 10:55:40 -06:00
Colton Myers
f4563ea9b7
Add stub release notes for 2015.5.6
2015-09-18 10:54:15 -06:00
Colton Myers
f5a322e3f2
Merge pull request #27208 from basepi/nop.state.25423
...
[2015.5] Add test.nop state
2015-09-18 10:50:17 -06:00
Colton Myers
9414b05b2c
Add test.nop example
2015-09-18 10:49:45 -06:00
Justin Findlay
1e335297e2
only write cron file if it is changed
...
Fixes #27215 .
2015-09-18 10:42:58 -06:00
Mike Place
59a07cae68
Merge pull request #27201 from jfindlay/sshhash
...
rename hash_hostname to hash_known_hosts
2015-09-18 09:45:03 -06:00
Mike Place
560545c4c5
Merge pull request #27214 from jacksontj/2015.5
...
Correctly support https, port 443 is not a requirement
2015-09-18 09:43:05 -06:00
Thomas Jackson
e7526bdb44
Correctly support https, port 443 is not a requirement
2015-09-17 19:05:10 -07:00
Colton Myers
a84ce67b8f
Add test.nop state
...
A no-op state that does nothing. Useful in conjunction with the `use`
requisite, or in templates which could otherwise be empty due to jinja
rendering
Unlike test.succeed_without_changes, takes **kwargs to be more flexible.
Also removed the test stuff from succeed_without_changes. If a state
doesn't make changes, its behavior should be identical whether in test
mode or not.
2015-09-17 17:22:49 -06:00
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
