Commit Graph

33582 Commits

Author SHA1 Message Date
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
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
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
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
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
Elias Probst
dfdb8a303f Fixes the doc rendering issues introduced in PR#13996. 2014-07-07 20:33:31 +02:00
Gareth J. Greenaway
b29984d81e another fix for changes that were breaking automated tests. 2014-07-07 11:02:52 -07: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
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
Pedro Algarvio
bbca1ee7cd White-space lint fix 2014-07-05 00:44:41 +01:00
vs
8f93ee0872 Merge remote-tracking branch 'upstream/develop' into multiple_masters_with_signatures 2014-07-04 03:18:49 -07:00
vs
309123e037 reorder code to make it more readable and maintainable 2014-07-04 03:15:39 -07:00
vs
d32380ce20 explain to the user what might be the problem with the missing signature 2014-07-04 03:13:46 -07:00
vs
7d37d6f3cd remove debug print 2014-07-04 03:12:32 -07:00
Thomas S Hatch
70dc6991da Merge pull request #13978 from whiteinge/doc-disclosure-proceedure
Document security disclosure proceedures
2014-07-03 21:14:23 -06:00
Seth House
92ebf99a1f Added security disclosure proceedure page
Closes #2315
2014-07-03 20:32:52 -06:00
Seth House
ddc4353248 Added central links for the various mailing lists 2014-07-03 20:32:26 -06:00
Joseph Hall
585e95cd40 Merge pull request #13975 from csakoda/develop
ec2.query: copying params dict so our headers don't leak between attempt...
2014-07-03 18:44:18 -06:00
Pedro Algarvio
2bb62a1f18 Merge pull request #13977 from hulu/augeas-shadowing
avoid shadowing in augeas state
2014-07-04 01:42:14 +01:00
Chris Rebert
8f7e5ea546 augeas state: avoid shadowing change() function
************* Module salt.states.augeas
salt/states/augeas.py:223: [W0621(redefined-outer-name), setvalue] Redefining name 'change' from outer scope (line 42)
2014-07-03 17:38:10 -07:00
Chris Rebert
8982842694 augeas state: avoid shadowing built-in file type
************* Module salt.states.augeas
salt/states/augeas.py:177: [W0622(redefined-builtin), change] Redefining built-in 'file'
2014-07-03 17:37:33 -07:00
Chuck Sakoda
09851a5425 ec2.query: copying params dict so our headers don't leak between attempts 2014-07-03 17:13:08 -07:00
Pedro Algarvio
ae36d905c2 Merge pull request #13952 from s0undt3ch/hotfix/lint
Lint Fixes
2014-07-04 00:57:39 +01:00
Pedro Algarvio
1ffb0e8a51 White-space related fixes 2014-07-04 00:56:49 +01:00
Pedro Algarvio
4acda7ab14 Move imports 2014-07-04 00:56:48 +01:00
Seth House
9a9a97fca9 Merge pull request #13973 from jacksontj/develop
Make netapi more of a process manager
2014-07-03 16:44:15 -06:00
Mike Place
89bf75fe84 Merge pull request #13974 from rallytime/schedule_unit_tests
Some unit tests for salt.utils.schedule
2014-07-03 15:55:09 -06:00
rallytime
a7eadd74ff remove unnecessary comment 2014-07-03 15:49:59 -06:00