C. R. Oldham
1e031c4940
Default configuration file for proxy minions.
2015-11-03 12:31:58 -07:00
Mike Place
ea3bf972c4
Merge pull request #28508 from twangboy/fix_unit_tests_windows
...
Fixed windows tests
2015-11-03 12:31:12 -07:00
Mike Place
73c5735fc1
Merge pull request #28525 from rallytime/route53_spacing
...
Fix spacing in doc examples for boto_route53 state and module
2015-11-03 12:30:24 -07:00
Mike Place
2bc78a32ef
Merge pull request #28534 from rallytime/fix-28469
...
Add versionadded directive for vpc_name arg in boto_secgroup.present
2015-11-03 12:30:04 -07:00
Joseph Hall
f05a5e0936
Fail gracefully if 169.254* isn't available
2015-11-03 11:42:07 -07:00
rallytime
ebe3b34ae7
Add versionadded directive for vpc_name arg in boto_secgroup.present
...
Fixes #27581
2015-11-03 11:34:16 -07:00
Justin Findlay
9c9bb75c37
decode highstate error messages to utf-8
...
Fixes #28476 .
2015-11-03 11:30:30 -07:00
rallytime
bc577b2531
Add versionadded directives to virtualenv_mod state/module
...
Fixes #24585
2015-11-03 11:22:51 -07:00
rallytime
1c612e2772
Update contributing and documentation pages to recommend submitting against branches
...
Fixes #28272
2015-11-03 10:44:29 -07:00
twangboy
0da6ff7c50
Fixed some logic
2015-11-03 10:09:49 -07:00
rallytime
6ab2ce615c
Fix spacing in doc examples for boto_route53 state and module
2015-11-03 08:50:41 -07:00
Mike Place
c6a6fe0089
Merge pull request #28516 from rallytime/bp-28489
...
Back-port #28489 to 2015.8
2015-11-03 07:05:54 -07:00
Mike Place
36a217acbd
Merge pull request #28506 from basepi/salt-ssh.minions.log.debug
...
[2015.8] Log minion list for all rosters, at debug level
2015-11-03 07:05:22 -07:00
Mike Place
2d7f934f67
Merge pull request #28517 from rallytime/fix-28243
...
Add state_auto_order defaults to True note to ordering docs
2015-11-03 07:04:40 -07:00
rallytime
be8f650901
Punctuation.
2015-11-02 19:30:58 -06:00
rallytime
fd846822c1
Add state_auto_order defaults to True note to ordering docs
...
Fixes #28243
2015-11-02 19:29:32 -06:00
TheBigBear
2e5684a1e4
Update windows-package-manager.rst
2015-11-02 19:25:12 -06:00
Colton Myers
8cbea63e40
Merge pull request #28514 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-02 18:19:33 -07:00
Colton Myers
463a03b2a9
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/modules/state.py
2015-11-02 17:39:11 -07:00
Colton Myers
63ce8f78d5
Merge pull request #28512 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-11-02 17:38:08 -07:00
Colton Myers
61c382133a
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
salt/cli/__init__.py
2015-11-02 16:52:09 -07:00
twangboy
cf1e059be5
Fixed windows tests
2015-11-02 16:16:22 -07:00
Colton Myers
06cdb50494
Log minion list for all rosters, at debug level
...
Logging the minion list at INFO is noisy for every call. It's debug
information. Additionally, we want to log the targets for every roster
type, so move the log higher in the call chain.
2015-11-02 15:05:36 -07:00
Mike Place
b919f55f8d
Merge pull request #28502 from cachedout/lint_28427
...
Lint #28427
2015-11-02 14:09:20 -07:00
Mike Place
459a342102
Lint #28427
2015-11-02 14:04:31 -07:00
Colton Myers
238411c8ce
Merge pull request #28464 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-02 13:18:21 -07:00
Colton Myers
6f6e687cb4
Mock master_uri for even tests
2015-11-02 12:15:53 -07:00
Mike Place
a25ce38fda
Merge pull request #28486 from rallytime/bp-26945
...
Back-port #26945 to 2015.8
2015-11-02 11:43:35 -07:00
Mike Place
f3640b3ad6
Merge pull request #28472 from gtmanfred/2015.8
...
overwrite more than one value with names
2015-11-02 10:56:53 -07:00
Mike Place
e31ef51053
Merge pull request #28493 from rallytime/bp-28492
...
Back-port #28492 to 2015.8
2015-11-02 10:54:09 -07:00
Mike Place
38c77206db
Merge pull request #28494 from whiteinge/match-filter_by-argfix
...
Fix filter_by passing incorrect parameters to match functions
2015-11-02 10:53:55 -07:00
C. R. Oldham
d354885c3d
Lint
2015-11-02 10:49:21 -07:00
C. R. Oldham
dbb1f0899e
Lint
2015-11-02 10:48:33 -07:00
Mike Place
d19affd44d
Merge pull request #28491 from rallytime/bp-28388
...
Back-port #28388 to 2015.8
2015-11-02 10:13:22 -07:00
Colton Myers
4bf56cad3f
Merge pull request #28461 from cachedout/issue_28455
...
Wrap all cache calls in state.sls in correct umask
2015-11-02 10:11:02 -07:00
Mike Place
f7042ba967
Merge pull request #28465 from twangboy/fix_12363
...
Fix #12363 : Password Expiration in Windows
2015-11-02 10:01:18 -07:00
Mike Place
ec0cbec00b
Merge pull request #28485 from eyj/fix_28484
...
Fix invalid usage of _get_conn causing #28484
2015-11-02 09:47:52 -07:00
Seth House
e61ac75d6f
Fix filter_by passing incorrect parameters to match functions
2015-11-02 09:32:29 -07:00
Christer Edwards
ffc77259c9
Updated FreeBSD installation docs:
...
- fixed URL in description
- set https in all URLs
2015-11-02 11:31:23 -05:00
Mike Place
f740a19477
Working right now
2015-11-02 11:00:33 -05:00
Mike Place
700eaebad0
Disable starting to come to life
2015-11-02 11:00:33 -05:00
Mike Place
f8b17748ef
More fixing
2015-11-02 11:00:33 -05:00
Mike Place
04585a2878
Documentation for disable_during_state_run
2015-11-02 11:00:33 -05:00
Mike Place
dbbd53689d
Add documentation note in inotify beacon
2015-11-02 11:00:33 -05:00
Mike Place
40217fe813
More refactoring and add new option to disable during state run
2015-11-02 11:00:33 -05:00
Mike Place
19af5e5ed3
Starting on refactor of beacon config parsing
2015-11-02 11:00:33 -05:00
Mike Place
1116798f21
Merge pull request #28454 from sdm24/fix-formatting-in-nodegroup-docs
...
Fixed nodegroup doc formatting to correctly link to pillar_opts in the master config
2015-11-02 08:14:40 -07:00
Mike Place
fac7803a59
Merge pull request #28487 from cachedout/lint_28456
...
Lint 28456
2015-11-02 07:52:27 -07:00
Mike Place
58fe15437a
Lint #28456
2015-11-02 07:51:51 -07:00
Mike Place
22a4f14625
Merge pull request #28457 from sdm24/update-grain-ip-interfaces-comments
...
Clarified comments for grains/core.py for ip_interfaces, ip4_interfac…
2015-11-02 07:47:59 -07:00
