Nicole Thomas
2a40f57b93
Merge pull request #28694 from s0undt3ch/2015.5
...
[2015.5] Update to latest bootstrap script v2015.11.09
2015-11-09 10:49:53 -07:00
Pedro Algarvio
0910c6ffe4
Update to latest bootstrap script v2015.11.09
...
* Make sure that wget is installed. saltstack/salt-bootstrap#868
2015-11-09 16:29:45 +00:00
Mike Place
3249b322e8
Merge pull request #28669 from rallytime/fix-26592
...
Use the -q argument to strip extraneous messages from rabbitmq
2015-11-07 18:07:25 -07:00
Mike Place
29e8250d0c
Merge pull request #28645 from jacksontj/2015.5
...
Rework minion return_retry_timer
2015-11-06 20:40:28 -07:00
Mike Place
1bbaea8aad
Merge pull request #28668 from twangboy/fix_15177
...
Fixed join_domain and unjoin_domain for Windows
2015-11-06 20:40:04 -07:00
Thomas Jackson
f63c2d70a7
Rework minion return_retry_timer
...
This feature originally would randomize between 1 -> return_retry_timer, which meant you could always had the possibility of haing a return retry with a timeout of 1s. This change maxes both ends of the range configurable (similar to how acceptance_wait_time is configured). In addition I've added coverage in the minion configuration documentation.
Cleanup of #27286
Fixes #28577
2015-11-06 18:05:45 -08:00
Mike Place
4ad5056066
Merge pull request #28666 from jfindlay/r_data
...
define r_data before using it in file module
2015-11-06 17:46:26 -07:00
Mike Place
e129e889ad
Merge pull request #28662 from cachedout/issue_24758
...
Add note about disabling master_alive_interval
2015-11-06 17:38:12 -07:00
twangboy
745b8f75f6
Fixed some lint
2015-11-06 17:30:31 -07:00
rallytime
098fb815af
Use the -q argument to strip extraneous messages from rabbitmq
...
Instead of trying to do it ourselves and worrying about which
version prints 'Listing vhosts...' and '...done' at the beginning
or end of the output or not.
Fixes #26592
2015-11-06 17:20:10 -07:00
twangboy
a43eb53f28
Added version added notes in docs
2015-11-06 17:12:19 -07:00
twangboy
6b537c8640
Fixed join_domain and unjoin_domain for Windows
...
Fixes #15177
Uses WMI instead of win32net
Added restart parameter
Seperated out error definitions into their own function
Added default workgroup to change to on unjoin
Added additional examples
Added additional parameter checking
Added function to get current domain or workgroup
2015-11-06 17:06:11 -07:00
Justin Findlay
29228f445f
define r_data before using it in file module
...
Fixes #28174 .
2015-11-06 14:37:15 -07:00
Mike Place
78f4894333
Add note about disabling master_alive_interval
...
Closes #24758
2015-11-06 14:15:06 -07:00
Mike Place
df121d0cec
Merge pull request #28627 from twangboy/backport_win_useradd
...
Backport win_useradd
2015-11-06 09:57:49 -07:00
Pedro Algarvio
64a20228c6
Merge pull request #28617 from cachedout/umask_module_sync
...
Set restrictive umask on module sync
2015-11-05 23:43:28 +00:00
twangboy
87282b6354
Backport win_useradd
...
Backported win_useradd.py from 2015.8 to fix issues with unicode, etc.
2015-11-05 14:32:55 -07:00
Joseph Hall
065f8c7fb3
Merge pull request #28622 from gravyboat/update_puppet_module_docs
...
Update puppet module wording
2015-11-05 13:34:07 -07:00
Forrest Alvarez
4ea28bed30
Update puppet module wording
2015-11-05 12:25:45 -08:00
Mike Place
227792e158
Set restrictive umask on module sync
...
Fixes #28398
2015-11-05 12:04:24 -07:00
Mike Place
08295de5a5
Merge pull request #28563 from s0undt3ch/2015.5
...
[2015.5] Update to latest bootstrap script v2015.11.04
2015-11-04 08:16:31 -07:00
Mike Place
1e09f186ce
Merge pull request #28541 from twangboy/fix_28173
...
Fixed problem with system.set_computer_name
2015-11-04 07:48:54 -07:00
Mike Place
f44ed780b5
Merge pull request #28537 from jfindlay/decode_state_2015.5
...
decode filename to utf-8 in file.recurse state
2015-11-04 07:48:18 -07:00
Mike Place
6acf87593f
Merge pull request #28529 from rallytime/fix-28272
...
Update contributing and documentation pages to recommend submitting against branches
2015-11-04 07:47:21 -07:00
Pedro Algarvio
16f4db79a0
Update to latest bootstrap script v2015.11.04
...
* Allow bypassing dependencies installation. Thanks EYJ. saltstack/salt-bootstrap#656 .
* Add FreeBSD 11 support. Thanks Chris Buechler(cbuechler). saltstack/salt-bootstrap#653
* Move RHEL installations to use repo.saltstack.com saltstack/salt-bootstrap#674
* Move Debian 8 installation to use repo.saltstack.com saltstack/salt-bootstrap#674
* Fix error finding python-jinja2 in RHEL 7. Thanks Rob Eden(hedinfaok). saltstack/salt-bootstrap#654
* Move Ubuntu 12 and 14 installations to use repo.saltstack.com saltstack/salt-bootstrap#674
* Move FreeBSD installations to use repo.saltstack.com saltstack/salt-bootstrap#674
* Use dnf on Fedora 22 and later. Thanks Michele Bologna (mbologna). saltstack/salt-bootstrap#665
2015-11-04 12:37:04 +00:00
Nicole Thomas
025bff2bf0
Merge pull request #28548 from nmadhok/2015.5-task-error
...
[Backport] [2015.5] Tasks can be in queued state instead of running
2015-11-03 21:14:24 -07:00
Nitin Madhok
804a0a6537
Tasks can be in queued state instead of running. Fixes #28511
2015-11-03 18:37:34 -05:00
Justin Findlay
63bd3e52b3
Merge pull request #28531 from rallytime/fix-24585
...
Add versionadded directives to virtualenv_mod state/module
2015-11-03 14:34:49 -07:00
twangboy
7edf5ce370
Fixed problem with system.set_computer_name
...
The previous function didn't fully change the name in windows
Fixes #28173
2015-11-03 14:33:21 -07:00
rallytime
a959681858
Add link to Sending a GH PR to documentation docs
2015-11-03 14:07:49 -07:00
Justin Findlay
06e514940c
decode filename to utf-8 in file.recurse state
...
Fixes #28524 .
2015-11-03 14:03:50 -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
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
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
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
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
097838ec0c
Wrap all cache calls in state.sls in correct umask
...
Refs #28455
2015-10-30 15:05:36 -06:00
Justin Findlay
37ceae1e88
Merge pull request #28448 from gwaters/add-redhat-notes
...
added a note to the tutorial for redhat derivatives
2015-10-30 12:49:53 -06:00
Gary Waters
e70990704a
added a note to the tutorial for those that redhat so they can use the state file too.
2015-10-30 09:47:46 -07:00
Mike Place
5ef50d60cd
Merge pull request #28406 from rallytime/bp-28381
...
Back-port #28381 to 2015.5
2015-10-29 13:10:37 -06:00
Mike Place
30d5f7bbae
Merge pull request #28413 from rallytime/bp-28400
...
Back-port #28400 to 2015.5
2015-10-29 12:06:46 -06:00
Mike Place
f3e61db045
Merge pull request #28407 from DSRCompany/issues/24910_token_auth_fix_2014
...
Don't request creds if auth with key.
2015-10-29 10:12:30 -06:00
