Commit Graph

33624 Commits

Author SHA1 Message Date
Thomas S Hatch
82368f8fdb Merge pull request #14017 from whiteinge/salt-loader-abs-basepath
Use an absolute path when using SALT_BASE_PATH
2014-07-07 17:14:34 -06:00
Thomas S Hatch
7ba7c2d32e Merge pull request #14013 from alex-leonhardt/fix_tls_create_self_signed_cert
fix #14011 - self_signed_cert also need the correct ssl version set
2014-07-07 16:49:00 -06:00
Thomas S Hatch
a3f9e89072 Merge pull request #14012 from rallytime/output_grains_tests
Test for unicode characters in grains outputter
2014-07-07 16:48:23 -06:00
Seth House
dbf5f8b6a4 Use an absolute path when using SALT_BASE_PATH
Salt's loader will skip non-absolute paths and relative paths are
generated with certain kinds of light Salt invocations such as in the
Python shell or in unit tests.
2014-07-07 15:24:27 -07:00
Thomas S Hatch
09366515dc Merge pull request #14016 from rallytime/fix_bad_copypaste
Fix typo in email from bad copy-paste
2014-07-07 16:16:47 -06:00
rallytime
d5c2a92d24 Fix typo in email from bad copy-paste 2014-07-07 16:12:11 -06:00
Colton Myers
330a2d3bb8 Merge pull request #14010 from cachedout/gpg_bin_check
gnupg test fix
2014-07-07 16:00:29 -06:00
Thomas S Hatch
c1d151067d verify the raet cacedir in tests 2014-07-07 15:56:16 -06:00
Thomas S Hatch
0ee755e66d Ensure that the raet cachedir is created in the verify_env 2014-07-07 15:52:43 -06:00
Alex Leonhardt
99b6ce535a fix #14011 - self_signed_cert also need the correct ssl version set 2014-07-07 22:48:43 +01:00
rallytime
b4f98fc505 fix email address 2014-07-07 15:44:36 -06:00
rallytime
e1b6a2a9f1 Remove unnecessary line 2014-07-07 15:37:07 -06:00
rallytime
9aceee587c Test for unicode characters in grains outputter 2014-07-07 15:35:10 -06:00
Mike Place
44a06ef7f0 Fix gpg test 2014-07-07 15:26:27 -06:00
Mike Place
13e32e815e Fixed silly mistake 2014-07-07 15:15:50 -06:00
Thomas S Hatch
47f3e269fe Merge pull request #14009 from cro/add_full_pubkey2
Add full gpg key
2014-07-07 15:07:51 -06:00
Thomas S Hatch
1d008ba008 Merge pull request #14006 from nmadhok/improve-boto_asg-state-docs
Improving docs for boto states
2014-07-07 15:07:24 -06:00
Thomas S Hatch
3e1b6b22d2 Merge pull request #14004 from nmadhok/improve-cmd-state-docs
Improving state docs for cmd
2014-07-07 15:04:05 -06:00
Thomas S Hatch
eb27c26fd3 Merge pull request #14001 from nmadhok/improve-dockerio-module-docs
Improving docs and fixing errors in dockerio module
2014-07-07 15:03:28 -06:00
Nitin Madhok
11a88fb7e8 Correcting spellings 2014-07-07 17:01:35 -04:00
Thomas S Hatch
032d54cbf7 Merge pull request #13998 from makinacorpus/ssl2
Fix #13997
2014-07-07 14:58:41 -06:00
Thomas S Hatch
9dd4b4ed42 Merge pull request #13870 from Sacro/updating-chocolatey-extension
Chocolatey.bat doesn't exist in 0.9.8.24
2014-07-07 14:57:59 -06:00
Nitin Madhok
746e46907e Improving docs for boto_sqs state 2014-07-07 16:57:37 -04:00
Thomas S Hatch
976069fbdb Merge pull request #13994 from terminalmage/issue13976
Fix shadowing in boto_elb module
2014-07-07 14:57:04 -06:00
Thomas S Hatch
e370a8da89 Merge pull request #13993 from tserong/patch-1
Pass --all when invoking `systemctl list-units`
2014-07-07 14:56:48 -06:00
Thomas S Hatch
5fdd29163e Merge pull request #13989 from thematthopkins/virtualbox_shared_folder_win2k3
Expands fix for skipping loading security descriptors on filesystems where they aren't present to work on win2k8+ and Directories
2014-07-07 14:56:26 -06:00
Nitin Madhok
1e789c4808 Improving docs for boto_secgroup state 2014-07-07 16:54:14 -04:00
Nitin Madhok
5ed2801f9a Improving docs for boto_route53 state 2014-07-07 16:51:32 -04:00
Thomas S Hatch
a0cf4c6939 Merge pull request #13979 from felskrone/multiple_masters_with_signatures
Multiple masters with signatures
2014-07-07 14:51:01 -06:00
Nitin Madhok
4692ffbc3d Improving docs for boto_lc state 2014-07-07 16:49:23 -04:00
Thomas S Hatch
cdc9c102c6 Merge pull request #13969 from garethgreenaway/13349_apt_update_refresh
Fixes to aptpkg.install
2014-07-07 14:45:06 -06:00
Nitin Madhok
8431fa1417 Improving docs for boto_iam_role state 2014-07-07 16:43:27 -04:00
Thomas S Hatch
eabd156d67 Merge pull request #13917 from felskrone/salt_at_scale_doc
Salt at scale doc
2014-07-07 14:41:37 -06:00
Mike Place
16e1dd3886 gnupg test fix
The gnupg lib will stack trace if the gpg binary isn't present on the
system.
2014-07-07 14:41:25 -06:00
C. R. Oldham
3b794c8450 Add full gpg public key. 2014-07-07 14:39:07 -06:00
Nitin Madhok
e4422b3bfa Improving docs for boto_elb state 2014-07-07 16:18:29 -04:00
Nitin Madhok
a02d63ed03 Fixing pylint violations 2014-07-07 16:12:00 -04:00
Nitin Madhok
213a7dfa84 Improving docs for boto_elasticache state 2014-07-07 16:09:43 -04:00
Ben Woodward
366d07fafb Default should be chocolatey.exe rather than bat 2014-07-07 21:09:20 +01:00
Nitin Madhok
775d09625d Changing :: to code-blocks 2014-07-07 15:58:38 -04:00
Nitin Madhok
3ea67b81aa Making changes as suggested by Mike 2014-07-07 15:27:04 -04:00
Nitin Madhok
b3fb6aa34d Changing code blocks from python to yaml 2014-07-07 15:22:52 -04:00
Joseph Hall
30de7186a4 Merge pull request #14003 from eliasp/fix-PR#13996
Fixes the doc rendering issues introduced in PR#13996.
2014-07-07 12:42:15 -06:00
Nitin Madhok
17d916c23d Fixing pylint violation 2014-07-07 14:35:27 -04:00
Elias Probst
dfdb8a303f Fixes the doc rendering issues introduced in PR#13996. 2014-07-07 20:33:31 +02:00
Nitin Madhok
00c87ff354 Improving docs and fixing errors 2014-07-07 14:26:51 -04:00
Gareth J. Greenaway
b29984d81e another fix for changes that were breaking automated tests. 2014-07-07 11:02:52 -07:00
Mathieu Le Marec - Pasquet
ff426d47fb Fix #13997 2014-07-07 19:53:26 +02:00
Gareth J. Greenaway
e64fbd5c25 fixing a typo which broke automated tests. 2014-07-07 10:31:28 -07:00
Gareth J. Greenaway
efd9f56500 Fixes to aptpkg.install to ensure that if the version is specified for a particular package and that version is already available in the package repository then a refresh of the package database isn't required. This works if the option version is passed or version is included in the pkgs option. If any packages are included without a version then a refresh is performed. An additional option was addeded to aptpkg.latest_version, show_installed, to return the latest_version even if the package was installed. 2014-07-07 10:31:27 -07:00