Colton Myers
|
60737c970e
|
Merge pull request #30391 from jtand/ipset
Added else statements
|
2016-01-15 12:17:55 -07:00 |
|
Mike Place
|
6ac1f6cf54
|
Merge pull request #30375 from rallytime/fix-cloud-log-formatting
Wrap formatted log statements with six.u() in cloud/__init__.py
|
2016-01-15 11:41:55 -07:00 |
|
Mike Place
|
c478148b60
|
Merge pull request #30384 from isbm/isbm-zypper-info-avaiable-fix
Bugfix: info_available does not work correctly on SLE 11 series
|
2016-01-15 11:31:57 -07:00 |
|
Mike Place
|
9fe2df82bd
|
Merge pull request #30376 from pritambaral/fix/flo-dir
Fix FLO_DIR path in 2015.8
|
2016-01-15 11:25:49 -07:00 |
|
justinta89
|
345b056406
|
Fixed lint error
|
2016-01-15 11:13:39 -07:00 |
|
justinta89
|
c20f9b6a87
|
Added else statements
|
2016-01-15 10:48:22 -07:00 |
|
Justin Findlay
|
3ac3804ddc
|
Merge pull request #30389 from jtand/ipset
Older versions of ipset don't support comments
|
2016-01-15 10:41:02 -07:00 |
|
Colton Myers
|
4cc9422bf8
|
Merge pull request #30373 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
|
2016-01-15 09:23:38 -07:00 |
|
Bo Maryniuk
|
c7bc20e865
|
Split information, that is compatible with the Zypper's output on SLE11.
|
2016-01-15 13:11:25 +01:00 |
|
Chhatoi Pritam Baral
|
534879e79f
|
Revert "Raet Salt broken when config moved to package directory"
This reverts commit 2afbe6803c.
|
2016-01-15 06:14:35 +05:30 |
|
rallytime
|
5e7fb0c428
|
Wrap formatted log statements with six.u() in cloud/__init__.py
Fixes #30374
|
2016-01-14 17:08:24 -07:00 |
|
Colton Myers
|
5b53bf2597
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
salt/cloud/clouds/linode.py
salt/states/rabbitmq_policy.py
|
2016-01-14 16:23:29 -07:00 |
|
jacobhammons
|
a9edb194a4
|
Merge pull request #30372 from jacobhammons/man-pages
Updated man pages for 2015.8.4, updated copyright to 2016
|
2016-01-14 16:18:40 -07:00 |
|
Jacob Hammons
|
891ddafcba
|
Updated man pages for 2015.8.4, updated copyright to 2016
|
2016-01-14 16:17:27 -07:00 |
|
justinta89
|
fac6c3f6ae
|
Fixed some typos from testing
|
2016-01-14 16:15:24 -07:00 |
|
justinta89
|
67d4997316
|
Older versions of ipset don't support comments
This should also fix a problem where the module will report incorrectly if there
isn't a comment.
|
2016-01-14 16:12:10 -07:00 |
|
Mike Place
|
e77585de17
|
Merge pull request #30370 from rallytime/remove-incomplete-func
Remove incomplete function
|
2016-01-14 15:49:45 -07:00 |
|
rallytime
|
e220fa5125
|
Remove incomplete function
|
2016-01-14 14:52:15 -07:00 |
|
Mike Place
|
eb1ecd9732
|
Merge pull request #30366 from rallytime/bp-28702
Back-port #28702 to 2015.8
|
2016-01-14 14:10:03 -07:00 |
|
Nicole Thomas
|
40594efc0b
|
Merge pull request #30361 from cro/esxi-proxy2
Flip the sense of the test for proxymodule imports, add more fns for esxi proxy
|
2016-01-14 13:54:08 -07:00 |
|
C. R. Oldham
|
8f7490ca98
|
Missed return statement.
|
2016-01-14 13:13:57 -07:00 |
|
C. R. Oldham
|
389ede9e3e
|
Lint
|
2016-01-14 12:24:56 -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 |
|
C. R. Oldham
|
9db34d6ffe
|
Lint
|
2016-01-14 12:03:25 -07:00 |
|
rallytime
|
4f2274a275
|
Remove extra line
|
2016-01-14 11:59:41 -07:00 |
|
Steve Valaitis
|
048b13cf73
|
Pass RBENV_VERSION in env dict, and protect shlex.split
|
2016-01-14 11:58:29 -07:00 |
|
C. R. Oldham
|
b5c7a46f7a
|
Lint
|
2016-01-14 11:23:35 -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
|
f4118be6e4
|
Merge pull request #30267 from isbm/isbm-zypper-isotimefix
Fix RPM issues with the date/time and add package attributes filtering
|
2016-01-14 11:00:01 -07:00 |
|
C. R. Oldham
|
1a3b1f2626
|
Don't use short variables
|
2016-01-14 10:50:46 -07:00 |
|
C. R. Oldham
|
b80577182a
|
Remove stub functions.
|
2016-01-14 10:46:46 -07:00 |
|
C. R. Oldham
|
58f7fc3285
|
Don't use single character variables.
|
2016-01-14 10:43:11 -07:00 |
|
C. R. Oldham
|
e712664bcf
|
Better comment.
|
2016-01-14 10:35:27 -07:00 |
|
C. R. Oldham
|
9e9a37d0d4
|
Indentation.
|
2016-01-14 10:34:21 -07:00 |
|
C. R. Oldham
|
6c9bf76e19
|
Revert earlier vmware change for ssl cert checking.
|
2016-01-14 10:33:02 -07:00 |
|
Mike Place
|
b61cb7a238
|
Merge pull request #30360 from jfindlay/remove_doc
file.remove, file.absent: mention recursive dir removal
|
2016-01-14 10:30:25 -07:00 |
|
C. R. Oldham
|
db8a281ab8
|
Flip the sense of the test for items (modules, etc) loaded by the proxy. Now load everything a regular minion would load, and only check to make sure __proxyenabled__ is present for proxymodules and grains
|
2016-01-14 10:30:06 -07:00 |
|
C. R. Oldham
|
00c4ef6ec2
|
Need a list
|
2016-01-14 10:30:06 -07:00 |
|
C. R. Oldham
|
0da7a6d6d1
|
Recreate the pr
|
2016-01-14 10:30:06 -07:00 |
|
Justin Findlay
|
a21ccd2700
|
file.remove, file.absent: mention recursive dir removal
Fixes #30330.
|
2016-01-14 10:20:02 -07:00 |
|
Mike Place
|
ba8d128025
|
Merge pull request #30221 from mbarrien/postgres-9.5
No rolcatupdate for user_exist in Postgres>=9.5 #26845
|
2016-01-14 09:52:49 -07:00 |
|
Mike Place
|
4787c2c9ad
|
Merge pull request #30358 from terminalmage/libgit2-version
Add libgit2 version to versions-report
|
2016-01-14 09:37:28 -07:00 |
|
Mike Place
|
af2ddfd31c
|
Merge pull request #30346 from pass-by-value/aws_vols_attach
Prevent orphaned volumes
|
2016-01-14 09:37:08 -07:00 |
|
Mike Place
|
bccb8f3b5b
|
Merge pull request #30349 from rallytime/bp-30347
Back-port #30347 to 2015.8
|
2016-01-14 09:26:37 -07:00 |
|
Mike Place
|
7ee61f0d62
|
Merge pull request #30354 from alprs/fix-pillar_ignore_missing
Make sure all ignore_missing SLSes are catched
|
2016-01-14 09:24:19 -07:00 |
|
Mike Place
|
4bdade6010
|
Merge pull request #30356 from nmadhok/patch-1
Adding code author
|
2016-01-14 09:23:08 -07:00 |
|
Erik Johnson
|
89fe571791
|
Add libgit2 version to versions-report
|
2016-01-14 09:59:45 -06:00 |
|
Nitin Madhok
|
581e4f5dc7
|
Adding code author
Adding code author since majority of the code was taken from salt/cloud/clouds/vmware.py
|
2016-01-14 10:04:47 -05:00 |
|
Andreas Lutro
|
2f662bbc8d
|
make sure *all* ignore_missing slses are catched
previously, only the last statement in top.sls with `ignore_missing:
true` would actually be effective.
|
2016-01-14 14:18:11 +01:00 |
|
rallytime
|
df70afdaa3
|
Merge #30231 with updates to dependency documentation
|
2016-01-13 16:41:29 -07:00 |
|