justinta89
2f77152479
Boto uses False for is_default instead of None
2016-01-19 10:12:11 -07:00
C. R. Oldham
5a923b3aa9
Merge pull request #30364 from rallytime/fix-30341
...
Add TLS version imports and add linode driver documentation notices
2016-01-14 12:04:47 -07:00
rallytime
79bcf151cb
Add TLS version imports and add linode driver documentation notices
...
Fixes #30341
2016-01-14 11:19:35 -07:00
Mike Place
f037fd9c27
Merge pull request #30184 from rallytime/bp-30166
...
Back-port #30166 to 2015.5
2016-01-13 11:27:36 -07:00
Mike Place
1d8413fd2f
Merge pull request #30291 from thegoodduke/for_fix_ipset
...
ipset: fix test=true & add comment for every entry
2016-01-12 12:40:23 -07:00
C. Gao
62d6ccf561
ipset: fix test=true & add comment for every entry
2016-01-12 14:34:46 +08:00
Justin Findlay
92889db638
Merge pull request #30248 from jfindlay/2015.5
...
add 2015.5.9 release notes
2016-01-08 16:13:10 -07:00
Justin Findlay
741f7aba31
add 2015.5.9 release notes
2016-01-08 16:08:03 -07:00
jacobhammons
7a329d89d7
Merge pull request #30237 from jacobhammons/man-pages-prev
...
Updated man pages, copyright year, and doc version for 2015.5.9
2016-01-08 11:10:05 -07:00
Jacob Hammons
2431c4c5c3
Updated man page and doc conf.py copyright year to 2016
2016-01-08 11:08:59 -07:00
Jacob Hammons
fe3da1c174
Updated man pages and doc version for 2015.5.9
2016-01-08 11:05:46 -07:00
Nicole Thomas
2c0b725924
Merge pull request #30207 from rallytime/rabbitmq_states_doc_fix
...
Use correct spacing in rabbitmq state examples
2016-01-07 11:37:35 -07:00
rallytime
8d48c24182
Use correct spacing in rabbitmq state examples
2016-01-07 11:19:39 -07:00
jacobhammons
b49cf910f4
Merge pull request #30191 from jacobhammons/banner-prev
...
Updated doc site banners
2016-01-06 15:37:40 -07:00
Jacob Hammons
c3390955b0
Updated doc site banners
2016-01-06 15:18:11 -07:00
Rob Gott
fa6b1b3022
adding split_env call to cp.hash_file to pick up saltenv in file query parameter
2016-01-06 13:02:57 -07:00
Mike Place
9363d6f5b6
Merge pull request #30125 from abednarik/update_user_home
...
Update user home event when createhome is set to False
2016-01-05 11:15:38 -07:00
Mike Place
1a5d585d91
Merge pull request #30127 from jsutton/clarify-documenation-for-random_master
...
Updating documentation and example minion config for random_master/master_shuffle.
2016-01-04 12:30:50 -07:00
Jered Sutton
01dbf385ef
Adding random_master to reference and updating master_shuffle.
...
Adding master_shuffle to the minion example config file as it is needed for multi-master PKI.
2016-01-02 23:49:08 -06:00
abednarik
56544a77f6
Update user home event when createhome is set to False
...
Removed cretehome from if statement since home should be updated even when createhome is set
to False.
Fixes #29633 .
2016-01-02 18:18:16 -03:00
Joseph Hall
28b1bbbe77
Merge pull request #30110 from markckimball/fix-verify_ssl-in-joyent-cloud
...
Fixed flag sent to salt.utils.http in order for verify_ssl to work correctly
2015-12-31 14:17:52 -07:00
Mark Kimball
e1c08cb269
Fixed flag sent to salt.utils.http in order for
...
verify_ssl to work appropriately.
2015-12-31 13:27:40 -07:00
Mike Place
040412b0b1
Merge pull request #30093 from zmalone/pillar-notes
...
Noting that file_roots and "state tree" should both be avoided
2015-12-30 15:40:05 -07:00
Mike Place
25edefc93a
Merge pull request #30097 from cachedout/note_on_password_process_list
...
Note concern about cleartext password in docs for shadow.gen_password
2015-12-30 15:37:33 -07:00
Mike Place
58aec884ef
Note concern about cleartext password in docs for shadow.gen_password
...
Closes #28120
2015-12-30 15:03:23 -07:00
Zach Malone
cfbfd58afe
Noting that file_roots and "state tree" should both be avoided, because in some
...
environments, the actual states show up another level down. Adding notes about why this is undesirable.
2015-12-30 13:10:46 -07:00
Mike Place
6b1c3a6bf2
Merge pull request #30089 from mpreziuso/patch-1
...
Fixes terminology and adds more accurate details about the algorithms
2015-12-30 13:02:18 -07:00
Michele Preziuso
50533add40
Fixes terminology and adds more accurate details about the algorithms
...
Source: https://httpd.apache.org/docs/2.2/misc/password_encryptions.html .
2015-12-30 19:27:32 +00:00
Mike Place
200d09385d
Merge pull request #30086 from cachedout/issue_29921
...
Document that gitfs needs recent libs
2015-12-30 12:26:05 -07:00
Mike Place
8c29e2dd6a
Document that gitfs needs recent libs
...
Closes #29921
2015-12-30 12:00:33 -07:00
Nicole Thomas
404414bf57
Merge pull request #30070 from cachedout/issue_27835
...
Add documentation on debugging salt-ssh
2015-12-29 16:00:06 -07:00
Mike Place
60431e342a
Add documentation on debugging salt-ssh
...
Closes #27835
2015-12-29 15:22:03 -07:00
Mike Place
84db12212d
Merge pull request #30059 from mpreziuso/patch-1
...
Fixes wrong function scope
2015-12-29 09:12:06 -07:00
Michele Preziuso
1cb1c2da07
Fixes wrong function scope
...
`sdecode` is not in `salt.utils` but rather in `salt.utils.locales`.
This causes Python to throw an exception when executing `win_update.list_updates verbose`:
```
The minion function caused an exception: Traceback (most recent call last):
File "c:\salt\bin\lib\site-packages\salt\minion.py", line 1036, in _thread_return
return_data = func(*args, **kwargs)
File "c:\salt\bin\lib\site-packages\salt\modules\win_update.py", line 512, in list_updates
return str(quidditch.GetSearchResultsPretty())
File "c:\salt\bin\lib\site-packages\salt\modules\win_update.py", line 310, in GetSearchResultsPretty
updates = self.GetSearchResults()
File "c:\salt\bin\lib\site-packages\salt\modules\win_update.py", line 305, in GetSearchResults
updates.append(salt.utils.sdecode(update))
AttributeError: 'module' object has no attribute 'sdecode'
```
2015-12-29 13:20:51 +00:00
Mike Place
1c6c9b1a06
Merge pull request #30025 from jtand/boto_tests
...
Skipping some Boto tests until resolved moto issue
2015-12-28 08:21:45 -07:00
justinta89
e706642152
Skipping some Boto tests until resolved moto issue
...
Similar to #29725 . Though, some of the tests are different, due to the older
branch. I'm not condisidering this a backport because of that.
2015-12-27 22:34:09 -07:00
Mike Place
0f91021c59
Merge pull request #29949 from aletourneau/2015.5
...
Enhanced netscaler docstring
2015-12-22 13:26:52 -07:00
Alexandre Létourneau
cf855fe262
Fixed trailing white spaces
2015-12-22 13:57:46 -05:00
Alexandre Létourneau
864801e002
fixed version
2015-12-22 12:47:01 -05:00
Alexandre Létourneau
041d9346c4
Enhanced netscaler docstring
2015-12-22 12:38:59 -05:00
Mike Place
229d3eb60b
Merge pull request #29941 from cachedout/boto_spelling
...
Fix spelling error in boto_vpc
2015-12-22 08:49:54 -07:00
Mike Place
b11bfd07b8
Fix spelling error in boto_vpc
2015-12-22 08:48:48 -07:00
Mike Place
69c5ada636
Merge pull request #29908 from cachedout/issue_29880
...
Allow kwargs to be passed to pacman provide for update func
2015-12-22 08:04:18 -07:00
Mike Place
ad0de4d563
Merge pull request #29909 from abednarik/freebsd_pkgng_non_interactive_fix
...
FreeBSD pkgng fix for non-interactive install.
2015-12-22 08:03:50 -07:00
abednarik
8ac213001a
FreeBSD pkgng fix for non-interactive install.
...
In pkgng the way to install packages and assumming yes in pre and post install scripts is to use
-y, same as apt-get or yum, for example. Also env variable ASSUME_ALWAYS_YES=YES can be used, but
in this case, is a good idea to follow others package manager implementation.
Also remove the check where only -y is used if pkgng is executed in dryrun mode. In this case
there is no difference between dryrun or not.
2015-12-21 19:02:03 -03:00
Mike Place
4cd77b4118
Allow kwargs to be passed to pacman provide for update func
...
Other providers do this. Pacman was probably just forgotten.
Fixes #29880
2015-12-21 14:31:49 -07:00
Mike Place
f43f3d166c
Merge pull request #29730 from rallytime/fix-24698
...
Update docker-py version requirement to 0.6.0 for dockerio.py files
2015-12-16 07:44:40 -07:00
rallytime
120fd5fdf0
Update docker-py version requirement to 0.6.0 for dockerio.py files
...
Fixes #24698
2015-12-15 17:08:53 -07:00
Mike Place
c393a4175a
Merge pull request #29715 from rallytime/fix-23343
...
Install correct package version, if provided, for npm state.
2015-12-15 16:19:45 -07:00
Mike Place
1310afbbc2
Merge pull request #29721 from terminalmage/nested-output-multiline-fix
...
Fix display of multiline strings when iterating over a list
2015-12-15 15:16:10 -07:00