Commit Graph

55580 Commits

Author SHA1 Message Date
jacobhammons
4066cf379c Merge pull request #25325 from jacobhammons/win-wua-doc
Add win_wua module to doc index
2015-07-10 10:11:08 -06:00
Jacob Hammons
859530397a Add win_wua module to doc index 2015-07-10 09:54:08 -06:00
Seth House
9548e385a5 Merge pull request #25286 from bbinet/pillarstack
add support for PillarStack ext_pillar
2015-07-10 09:51:17 -06:00
Justin Findlay
7376ef426d Merge pull request #25309 from davidjb/patch-3
Format /etc/locale.gen correctly in salt.modules.localemod.gen_locale
2015-07-10 08:24:08 -06:00
Bruno Binet
eaa8999704 hopefully fix W1699 pylint error 2015-07-10 09:22:47 +02:00
Bruno Binet
7dfd8b59ce whitespace cleanup 2015-07-10 09:00:18 +02:00
Bruno Binet
989175defa use string formatting instead of string substitution 2015-07-10 08:55:54 +02:00
David Beitey
1c133591e2 Format /etc/locale.gen correctly on gen_locale
Prior to this change, the ``file.replace`` call matches an end-of-line character, which changes a file from:
```
...
# en_US.UTF-8 UTF-8
# en_ZA ISO-8859-1
...
```
to
```
...
en_US.UTF-8 UTF-8# en_ZA ISO-8859-1
...
``` 
which is incorrectly formatted -- the newline char being removed means the whole section after the whitespace is considered the charset.  See http://www.man-online.org/page/5-locale.gen/.

This may fix #24827.
2015-07-10 15:09:06 +10:00
Thomas S Hatch
a0e585f8f8 Merge pull request #25267 from jfindlay/disk_mod
Disk module improvements
2015-07-09 19:30:45 -06:00
Thomas S Hatch
be85147daa Merge pull request #25304 from salekseev/fix-log_handler_fluent
Fix exessive escaping in fluent log handler
2015-07-09 19:29:44 -06:00
Thomas S Hatch
cf0152a165 Merge pull request #25251 from isbm/isbm-rsync-state
Rsync state
2015-07-09 19:27:18 -06:00
Thomas S Hatch
768df4bf17 Merge pull request #25239 from DSRCompany/pillarenv_CR_bugfixes
Minor bugfixes in pillarenv support
2015-07-09 19:25:24 -06:00
Stas Alekseev
231edee777 This is to fix exessive escaping produced by sending the dict though
a JSON processor and instead relies on msgpack.
2015-07-09 18:46:07 -04:00
Justin Findlay
a3e209d538 Merge pull request #25290 from pcdummy/locale-gen_fix
Simple fix for locale.present on Ubuntu.
2015-07-09 09:18:02 -06:00
Bo Maryniuk
70a7f55146 Fix lint 2015-07-09 16:28:31 +02:00
Bo Maryniuk
a4d1a92d6f Add version 2015-07-09 16:28:20 +02:00
René Jochum
18cff0f454 Simple fix for locale.present on Ubuntu.
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-09 13:41:46 +02:00
Bruno Binet
7af1332bf2 remove installation section now that PillarStack comes with salt 2015-07-09 12:18:59 +02:00
Bruno Binet
aeb18beb4f import PillarStack doc from upstream repository readme 2015-07-09 12:17:35 +02:00
Bruno Binet
cbc460059d import PillarStack ext_pillar from upstream repository
wget https://raw.githubusercontent.com/bbinet/pillarstack/master/stack.py
2015-07-09 12:03:38 +02:00
Joseph Hall
d41068ff61 Merge pull request #25276 from jacobhammons/spm-man-page
copy spm.1 man page during setup
2015-07-08 20:53:17 -06:00
Jacob Hammons
d27ab32d0e copy spm.1 man page during setup
Refs #25213
2015-07-08 19:25:09 -06:00
Seth House
a2f1a56393 Merge pull request #25122 from arthurlogilab/sharedsecretauth
[auth] add sharedsecret auth (closes #25121)
2015-07-08 19:13:05 -06:00
Colton Myers
0654ef5a08 Merge pull request #25273 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-07-08 18:59:28 -06:00
Seth House
635abd5e18 Merge branch 'runner-kwargs' into develop 2015-07-08 17:39:51 -06:00
Colton Myers
a40574850f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-08 16:26:25 -06:00
Nicole Thomas
9e906030a0 Merge pull request #25263 from techhat/nonstandard
Allow non-standard HTTP requests on tornado
2015-07-08 15:27:08 -06:00
Justin Findlay
fb86a77706 update release codenames 2015-07-08 14:52:14 -06:00
Justin Findlay
beb9715d0e update blockdev tests for deprecation 2015-07-08 14:50:52 -06:00
Nicole Thomas
4e7346aac4 Merge pull request #25253 from s0undt3ch/2015.8
Remove the deprecation warning. The driver has been renamed.
2015-07-08 14:48:31 -06:00
Joseph Hall
ee62c75beb Allow non-standard HTTP requests on tornado 2015-07-08 14:37:50 -06:00
Nicole Thomas
679cdbac69 Merge pull request #25248 from techhat/issue22391
Do not resize while iterating
2015-07-08 13:38:36 -06:00
Pedro Algarvio
ea7afb49d2 Remove the deprecation warning. The driver has been renamed. 2015-07-08 18:07:49 +01:00
Bo Maryniuk
9435cb927b Implement Rsync synchronization state 2015-07-08 18:53:34 +02:00
Bo Maryniuk
a72477f64b Fix docstring for the main method 2015-07-08 18:52:53 +02:00
Bo Maryniuk
e3176df549 Implement Rsync changes extractor 2015-07-08 18:52:14 +02:00
Bo Maryniuk
eab59dd5d6 Implement Rsync summary extractor 2015-07-08 18:51:44 +02:00
Bo Maryniuk
57a8454253 Change the module docstring 2015-07-08 18:50:56 +02:00
Bo Maryniuk
4ea0cb5035 Add license and SUSE copyright 2015-07-08 18:50:37 +02:00
Pedro Algarvio
631cee1627 Merge pull request #25244 from rallytime/parted_deprecations
Remove parted deprecations and fix failing tests
2015-07-08 17:42:00 +01:00
Nicole Thomas
810b1090ac Merge pull request #25242 from ruzarowski/2015.8
Make SourceDestCheck flag available to network interface definition
2015-07-08 10:36:22 -06:00
Joseph Hall
4f2abe5cba Do not resize while iterating 2015-07-08 10:29:22 -06:00
Erik Johnson
08bbfcd4d9 Merge pull request #25231 from thepauleh/patch-1
[25230] Change LXC version to come from lxc-info
2015-07-08 11:09:06 -05:00
Mike Place
e6251e78eb Merge pull request #25226 from nmadhok/client-runtime-fix-backport-2015-8
Backporting fix for issue #25223 on 2015.8 branch
2015-07-08 09:11:03 -06:00
rallytime
138c4f1e72 Remove parted deprecations and fix failing tests 2015-07-08 09:03:55 -06:00
Mike Place
169d81ab5a Merge pull request #25224 from nmadhok/client-runtime-fix
Fixing issue which causes Runtime Errors because of changing the list which is being looped over
2015-07-08 09:01:44 -06:00
Mike Place
98e4fde483 Merge pull request #25234 from krak3n/fix/boto_asg_update_args
Fix: Bug in boto_asg state argument passing to boto_asg module
2015-07-08 08:59:26 -06:00
Mike Place
3adfcf26fb Merge pull request #25227 from nmadhok/doc-fix
Changing the way links look on the index page
2015-07-08 08:57:28 -06:00
Mike Place
5db000d9ca Merge pull request #25222 from rallytime/bp-25219
Back-port #25219 to 2015.8
2015-07-08 08:55:17 -06:00
Dmitry Kuzmenko
ca233e56e5 RunnerClient support old style commands with kwargs on top level.
1. Use low['args'] low['kwargs'] if specified and not empty in the low data.
2. Lookup root level and set kwargs in low data if missing.
2015-07-08 17:53:46 +03:00