Justin Findlay
0447808d95
clarify, motivate orchestration docs
2015-07-10 17:03:27 -06:00
Justin Findlay
b0196fccb7
Merge pull request #25326 from rallytime/bp-20972
...
Back-port #20972 to 2015.5
2015-07-10 12:49:44 -06:00
Justin Findlay
28450d124e
Merge pull request #25327 from rallytime/bp-25290
...
Back-port #25290 to 2015.5
2015-07-10 12:49:37 -06:00
Justin Findlay
8f666a24f3
Merge pull request #25328 from rallytime/bp-25309
...
Back-port #25309 to 2015.5
2015-07-10 11:22:59 -06:00
jacobhammons
0a33a1d8bb
Merge pull request #25322 from jacobhammons/release-2015.5.3
...
version change to 2015.5.3
2015-07-10 10:11:24 -06:00
David Beitey
44d44ec574
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 10:02:30 -06:00
René Jochum
20032c55f3
Simple fix for locale.present on Ubuntu.
...
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-10 10:00:49 -06:00
Johannes Ebke
51c941f59d
Also fix cleanup of interfaces when using AssociatePublicIpAddress in #19288
2015-07-10 09:58:08 -06:00
Jacob Hammons
19f88920fa
version change to 2015.5.3
2015-07-10 09:43:15 -06:00
Justin Findlay
2f0f59b6cb
Merge pull request #25308 from jacksontj/2015.5
...
Make clear commands trace level logging
2015-07-10 08:20:06 -06:00
Thomas Jackson
60fc770ba2
Make clear commands trace level logging
2015-07-09 19:10:39 -07:00
Thomas S Hatch
9b6646d578
Merge pull request #25269 from jfindlay/tomcat
...
Extract tomcat war version
2015-07-09 19:28:21 -06:00
Thomas S Hatch
0f82ac3e30
Merge pull request #25238 from DSRCompany/pillarenv_backport_2015.5
...
Pillarenv backport 2015.5
2015-07-09 19:25:07 -06:00
C. R. Oldham
219d4cad9c
Merge pull request #25299 from twangboy/fix_13943
...
Added -NonInteractive so powershell doesn't hang waiting for input
2015-07-09 15:00:16 -06:00
jacobhammons
1c43892a80
Merge pull request #25301 from jacobhammons/doc-bugs
...
bug fix for module function display in help
2015-07-09 14:46:34 -06:00
Jacob Hammons
f6561289af
bug fix for module function display in help
2015-07-09 14:13:29 -06:00
twangboy
c05889031f
Added -NonInteractive so powershell doesn't hang waiting for input
2015-07-09 13:27:19 -06:00
Nicole Thomas
68149bc686
Merge pull request #25279 from jacobhammons/job-cache-docs
...
Additional docs on external and master job cache, assorted doc fixes
2015-07-09 10:46:26 -06:00
Nicole Thomas
972fa2fb54
Merge pull request #25274 from jleroy/25268-fix
...
Fix for issue #25268
2015-07-09 07:36:26 -06:00
Jacob Hammons
57dfa92d5a
Fixed typos
2015-07-08 21:12:24 -06:00
Jacob Hammons
2f9e5b9125
Additional docs on external and master job cache, assorted doc fixes
...
Refs #25277
2015-07-08 20:33:34 -06:00
Shane Lee
8ebb73df2d
Merge pull request #25272 from twangboy/service
...
Fixed problem with service not starting
2015-07-08 17:29:48 -06:00
Jonathan Leroy
2c698d204b
Fix for issue #25268
2015-07-09 01:12:15 +02:00
twangboy
e61eeba48b
Fixed problem with service not starting
2015-07-08 22:23:45 +00:00
Justin Findlay
fd4fca172d
consolidate tomcat exec and state version extract
2015-07-08 15:40:39 -06:00
Justin Findlay
59dc833567
update tomcat war_deployed state tests
2015-07-08 15:39:52 -06:00
Mike Place
c6efd2356c
Merge pull request #25225 from nmadhok/client-runtime-fix-backport-2015-2
...
Backporting fix for issue #25223 on 2015.5 branch
2015-07-08 09:16:18 -06:00
Dmitry Kuzmenko
98792eb179
Pillarenv support in minion config, cp and cmdmod modules.
...
Backport of PR #23926
2015-07-08 17:29:35 +03:00
Dmitry Kuzmenko
88ff576f39
Support pillarenv cmdline in state.sls. Backport of PR #23719
2015-07-08 17:29:35 +03:00
Nitin Madhok
391b7d6730
Backporting fix for issue #25223 on 2015.2 branch
2015-07-08 02:19:45 -04:00
Justin Findlay
207fbaeac4
Merge pull request #25214 from rallytime/http_doc
...
A couple of doc fixes for the http tutorial
2015-07-07 16:23:07 -06:00
rallytime
d0b61f3fc1
A couple of doc fixes for the http tutorial
2015-07-07 15:12:36 -06:00
Thomas S Hatch
9dd5cd8a8e
Merge pull request #25194 from rallytime/fix-24272
...
Update moto version check in boto_vpc_test and update min version
2015-07-07 12:27:32 -06:00
Colton Myers
a3e9486c28
Merge pull request #25205 from basepi/releasecandidatedocs
...
Update releasecandidate docs
2015-07-07 09:25:24 -06:00
Colton Myers
452880d4aa
Update releasecandidate docs
2015-07-07 09:24:57 -06:00
rallytime
f959e165a1
Clean up imports
2015-07-07 06:28:10 -06:00
rallytime
fbc9c0d6bf
Fix Pylint
2015-07-07 05:43:00 -06:00
Justin Findlay
fbafd39a46
Merge pull request #25187 from UtahDave/fix_misspelling
...
Doc fixes: Fix misspelling and remove extraneous double spaces
2015-07-06 19:07:04 -06:00
Justin Findlay
ddee90ce23
Merge pull request #25182 from cachedout/pack_long_floats
...
Try to re-pack long floats as strs
2015-07-06 19:06:43 -06:00
Justin Findlay
df9982b836
Merge pull request #25185 from rallytime/bp-25128
...
Back-port #25128 to 2015.5
2015-07-06 18:58:00 -06:00
Justin Findlay
df0bb8c831
Merge pull request #25181 from rallytime/bp-25102
...
Back-port #25102 to 2015.5
2015-07-06 18:57:13 -06:00
Justin Findlay
04fdd7b0ee
Merge pull request #25179 from rallytime/bp-25059
...
Back-port #25059 to 2015.5
2015-07-06 18:56:44 -06:00
Shane Lee
58b7d0e653
Merge pull request #25196 from twangboy/pkg_refresh
...
Fixed #18919 false-positive on pkg.refresh
2015-07-06 18:24:13 -06:00
Nicole Thomas
4a406aca45
Merge pull request #25180 from rallytime/bp-25088
...
Back-port #25088 to 2015.5
2015-07-06 14:33:45 -06:00
twangboy
12ffcd1062
Fixed #18919 false-positive on pkg.refresh
2015-07-06 14:30:38 -06:00
rallytime
fe2561f415
Update moto version check in boto_vpc_test and update min version
...
Fixes #24272
2015-07-06 14:03:59 -06:00
Colton Myers
01ed062ca7
Merge pull request #25191 from basepi/fix.fileclient.is_cached
...
Add extrndest back to fileclient.is_cached in 2015.5
2015-07-06 13:35:24 -06:00
Justin Findlay
a9404aea5c
Merge pull request #25175 from rallytime/bp-25020
...
Back-port #25020 to 2015.5
2015-07-06 12:53:19 -06:00
Justin Findlay
c70fec65b8
Merge pull request #25173 from rallytime/partial-bp-25019
...
Partial back-port of #25019
2015-07-06 12:52:59 -06:00
Justin Findlay
c5ba9a90ba
Merge pull request #25171 from rallytime/bp-25001
...
Back-port #25001 to 2015.5
2015-07-06 12:51:53 -06:00
