Commit Graph

33806 Commits

Author SHA1 Message Date
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
C. R. Oldham
da4acb0529 merge commit 2014-07-07 14:50:03 -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
C. R. Oldham
40e3002e07 merge commot 2014-07-07 14:42:19 -06: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
C. R. Oldham
92bc16cd2f merge commit 2014-07-07 14:29:31 -06:00
C. R. Oldham
e023abe2f0 Add full gpg public key. 2014-07-07 14:27:05 -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
Joseph Hall
04f7bb163c Merge pull request #13996 from eliasp/doc-code-blocks
Corrected/improved code-block usage in salt.states.pkg
2014-07-07 11:12:17 -06:00
Elias Probst
ad2a83e278 Don't show SLS YAML code as 'Python' code in the docs. 2014-07-07 19:06:37 +02:00
Mike Place
31dc08c7e2 Merge pull request #13995 from rallytime/typo_fix
Fixed some typos in modules.dockerio
2014-07-07 11:02:58 -06:00
Elias Probst
4b78bd7194 Don't show the APT sources.list entry as 'Python' code in the docs. 2014-07-07 19:02:47 +02:00
rallytime
f5bfbf3d9e Fixed some typos in modules.dockerio 2014-07-07 10:59:30 -06:00
Ben Woodward
d67d81c399 Chocolatey 0.8.24 uses .exe rather than .bat 2014-07-07 17:34:33 +01:00
Erik Johnson
44750010a9 Fix shadowing in boto_elb module 2014-07-07 11:02:59 -05:00
C. R. Oldham
e7413db7f4 Merge commit 2014-07-07 09:37:25 -06:00
Thomas S Hatch
f63c85f596 Merge pull request #13968 from makinacorpus/tls
tls additions:
2014-07-07 08:51:28 -06:00
Thomas S Hatch
b582d8c608 Merge pull request #13965 from nmadhok/add-test-ability-docker-state
Adding testing ability in pull, push and built dockerio state functions
2014-07-07 08:48:33 -06:00
Thomas S Hatch
0945e13b23 Merge pull request #13953 from s0undt3ch/features/osrelease-info
Implement `osrelease_info`. Fixes #13822
2014-07-07 08:46:49 -06:00
Tim Serong
968b26f453 Pass --all when invoking systemctl list-units
`systemctl list-units` without --all won't list services that aren't
actually running.  See https://github.com/saltstack/salt/issues/13788
for some further discussion.
2014-07-07 21:14:26 +10:00
Matthew Hopkins
8b7f2d831a comment fix 2014-07-06 22:32:21 -04:00
Matthew Hopkins
ccebad6b7d Expands fix for skipping loading security descriptors on filesystems where they aren't present to work on win2k8+ 2014-07-06 22:27:23 -04:00
Joseph Hall
03b3f9c95a Merge pull request #13987 from s0undt3ch/hotfix/transifex-updates
Update 'doc/.tx/config' - Build #104
2014-07-06 17:42:36 -06:00
Pedro Algarvio
6410f4ba59 Update 'doc/.tx/config' - Build #104
http://cookingwithsalt.org/job/salt/job/transifex/104/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-07-07 00:28:16 +01:00
Erik Johnson
7dc67a7ce8 Convert :: to code-block 2014-07-06 16:43:51 -05:00
Erik Johnson
67df3a9db4 Fix code-block
This is another fix to make the docs more accurate with the new sphinx
theme.
2014-07-05 22:51:05 -05:00
Joseph Hall
21d405f49e Merge pull request #13985 from roxit/develop
Allow using connection_args in keystone.service_delete
2014-07-05 07:09:29 -06:00
Pedro Algarvio
aceadc54c6 In the end we want a tuple... 2014-07-05 10:58:08 +01:00
Pedro Algarvio
33e9a075af Implement osrelease_info. Fixes #13822 2014-07-05 10:58:08 +01:00
Shanshi Shi
1e59cd272a Allow using connection_args in keystone.service_delete 2014-07-05 16:17:57 +08:00
Joseph Hall
d5bfe0a827 Merge pull request #13982 from s0undt3ch/hotfix/lint
Lint Fixes
2014-07-04 21:18:31 -06:00
Pedro Algarvio
ed7d14e237 White-space lint fix 2014-07-05 00:45:53 +01:00