Mike Place
60431e342a
Add documentation on debugging salt-ssh
...
Closes #27835
2015-12-29 15:22:03 -07: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
Erik Johnson
761be9cb93
Fix display of multiline strings when iterating over a list
...
When iterating over a list, the prefix is a dash followed by a space.
However, the prefix was being prepended to each line of a string before
adding it to the output. This means that each line of the string appears
to be a distinct list element.
This commit fixes this issue by only prepending the prefix on the first
line of a multiline string. On all other lines, a prefix consisting of a
number of spaces equal to the length of the prefix is used, ensuring
that the mulitline string is consistently indented.
2015-12-15 14:56:30 -06:00
Mike Place
52cc07cec9
Merge pull request #29646 from rallytime/fix-29488
...
Don't stacktrace on kwargs.get if kwargs=None
2015-12-15 12:02:58 -07:00
rallytime
a0ed857c37
Install correct package version, if provided, for npm state.
...
Fixes #23343
We already have taken care of the correct formatting for either
a list of packages, or a single package name with 'pkg_list'. Let's
use it so the version information can be passed to the install
function as well as the name.
2015-12-15 11:43:45 -07:00
Mike Place
f606c23ea8
Merge pull request #29673 from rallytime/fix-29661
...
Default value should be False and not 'False'
2015-12-14 11:08:44 -07:00
rallytime
e4af7a1157
Default value should be False and not 'False'
...
If default is a string, then "if x" statements will be True, not False.
2015-12-14 09:10:39 -07:00
rallytime
c5fa9e9351
Don't stacktrace on kwargs.get if kwargs=None
...
Fixes #29488
2015-12-11 16:53:29 -07:00
Mike Place
f77c8e7baf
Merge pull request #29527 from jfindlay/2015.5
...
2015.5.7 notes: add note about not being released
2015-12-08 14:08:26 -07:00
Colton Myers
867d550271
Merge pull request #29539 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-12-08 12:14:51 -07:00
Colton Myers
2c9c4ba430
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
doc/conf.py
2015-12-08 12:14:10 -07:00
Mike Place
de7f3d5a59
Merge pull request #29504 from rallytime/fix-12072
...
Document userdata_file option for EC2 driver
2015-12-08 09:54:33 -07:00
Mike Place
65deba8bb5
Merge pull request #29507 from rallytime/ec2-doc-fix
...
Switch volumes and del_*_on_destroy example ordering
2015-12-08 09:50:10 -07:00
Justin Findlay
1a8044f0c9
2015.5.7 notes: add note about not being released
2015-12-08 09:12:36 -07:00
rallytime
90b4823bc2
Switch volumes and del_*_on_destroy example ordering
...
Refs #29101
2015-12-07 19:30:23 -07:00
rallytime
8357c95dc2
Document userdata_file option for EC2 driver
...
Fixes #12072
2015-12-07 16:52:10 -07:00
Mike Place
0918c9294f
Merge pull request #29469 from abednarik/doc_note_for_saltcloud_connection_timeout
...
Added Documentation note in salt cloud.
2015-12-07 11:27:45 -07:00
abednarik
8e5c3e366a
Added Documentation note in salt cloud.
...
Added a Note for salt cloud settings since documentation shows those key in uppercase, but salt cloud expects thos in lowercase.
2015-12-06 13:42:18 -03:00
Mike Place
e43c7c05a6
Merge pull request #29461 from dmyerscough/fix-resource-limits
...
Fix resource limits, systemd sets the default too small
2015-12-05 09:26:34 -07:00
Damian Myerscough
85a8a3b033
Fix resource limits, systemd sets the default number of open files to 4096 causing te master to complain about limits when you have a large number of keys
2015-12-05 00:21:57 -08:00
Justin Findlay
730f02fbdf
Merge pull request #29439 from rallytime/bp-28656
...
Back-port #28656 to 2015.5
2015-12-04 15:56:16 -07:00
Clark Perkins
2f11bb021f
#28526 fixed yumpkg module
2015-12-04 11:27:37 -07:00
jacobhammons
197210d52e
Merge pull request #29418 from jacobhammons/dot8
...
Added CVE 2015-8034 to 2015.5.8 release notes
2015-12-03 20:02:53 -07:00
Jacob Hammons
4f51a737f9
Added CVE 2015-8034 to 2015.5.8 release notes
2015-12-03 20:02:16 -07:00
Mike Place
b3452f2a1a
Merge pull request #29389 from jacobhammons/2015.5
...
updated version numbers in documentation
2015-12-03 09:27:23 -07:00
jacobhammons
85aa70a6cb
Merge pull request #29392 from jacobhammons/2014.7
...
updated version number to not reference a specific build from the lat…
2015-12-03 08:54:31 -07:00
Jacob Hammons
d7f0db1dd8
updated version number to not reference a specific build from the latest branch
2015-12-03 08:45:03 -07:00
Jacob Hammons
824721ff36
updated version numbers
2015-12-03 08:20:22 -07:00
Mike Place
6a7a95f28a
Merge pull request #28501 from twangboy/jmoney_26898
...
Requested fixes for 26898
2015-12-02 18:12:12 -07:00
Mike Place
760a521603
Merge pull request #29348 from jtand/file_search_fix
...
Fixes an file.search on python2.6
2015-12-02 16:26:36 -07:00
justinta89
04f82bd4fd
Fixes an file.search on python2.6
2015-12-02 15:31:23 -07:00
Mike Place
51ea88d489
Merge pull request #29336 from rallytime/bp-29276
...
Back-port #29276 to 2015.5
2015-12-02 12:37:42 -07:00
Mike Place
28255af52a
Merge pull request #29333 from rallytime/bp-29280
...
Back-port #29280 to 2015.5
2015-12-02 12:37:05 -07:00
abednarik
3a0e19debb
Prevent adding port twice when adding entry in known hosts
...
Check hostname value inside remote_host dictionary to find out ':'. In that case don't append port
2015-12-02 08:36:33 -07:00
Mike Place
722d02ff4a
Lint
2015-12-02 08:33:14 -07:00
