valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,988 Commits 24 Branches 182 Tags 341 MiB
2a4c11ae24
Commit Graph

57988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
2a4c11ae24 Merge pull request #27526 from eliasp/2015.8-modules.slack_notify-doc-params 
Add missing newlines before param listing to fix doc rendering
 2015-09-30 09:19:04 -06:00
Nicole Thomas
e5de9409c2 Merge pull request #27525 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-29 21:38:22 -06:00
Colton Myers
1f3eb1c526 Remove useless mocked unit test 2015-09-29 18:23:46 -06:00
Elias Probst
204e66943f Add missing newlines before param listing to fix doc rendering 2015-09-29 23:33:49 +02:00
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
 2015-09-29 14:56:41 -06:00
Justin Anderson
0e37fb3bd3 Merge pull request #27513 from terminalmage/fix-worktree-tests 
Fix integration tests for worktree addition in git >= 2.6
 2015-09-29 12:39:19 -06:00
Nicole Thomas
e974a3c8aa Merge pull request #27510 from rallytime/ryan-lane-test-fix 
Merge #27475 with test fixes
 2015-09-29 12:34:32 -06:00
Colton Myers
6d773f66c3 Merge pull request #27516 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-09-29 11:53:33 -06:00
Colton Myers
a08951f0fa Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/utils/cloud.py
 2015-09-29 11:52:32 -06:00
Erik Johnson
519bdd6438 Fix integration tests for worktree addition in git >= 2.6 
The output from 'git worktree add' changed slightly in 2.6.
 2015-09-29 12:01:45 -05:00
rallytime
cae2c4e715 Syntax fix 2015-09-29 10:02:16 -06:00
rallytime
458547ba03 Fix test failures for boto __state__ changes 2015-09-29 09:55:44 -06:00
Mike Place
d85b0cbd69 Merge pull request #27451 from ticosax/dockerng-host-config-support 
[dockerng] Enforce usage of host_config and require docker-py>=1.4.0
 2015-09-29 09:51:28 -06:00
Mike Place
e8f58a6a3f Merge pull request #27461 from cachedout/clean_context_ioloop 
Only clean context if it exists
 2015-09-29 09:49:52 -06:00
Mike Place
68d784c3dd Merge pull request #27472 from cachedout/fix_27447 
Change recommeded schema for data field in mysql event table
 2015-09-29 09:49:37 -06:00
Mike Place
ee6e0ed057 Merge pull request #27468 from cachedout/fix_27351 
Fix 27351
 2015-09-29 09:35:29 -06:00
Mike Place
a214c7f84e Merge pull request #27479 from aboe76/fix_locale_suse 
fix locale on opensuse and suse #27438
 2015-09-29 09:34:48 -06:00
Mike Place
25a30a5621 Merge pull request #27473 from terminalmage/issue27220 
salt.utils.gitfs: Don't use close_fds=True on Windows
 2015-09-29 09:34:03 -06:00
Mike Place
931f593b51 Merge pull request #27483 from rallytime/fix-17103 
Outputters should sync to output, not outputters, on the minion.
 2015-09-29 09:33:08 -06:00
Mike Place
9c2c028953 Merge pull request #27484 from rallytime/bp-27434-and-27470 
Back-port #27434 and #27470 to 2015.5
 2015-09-29 09:32:03 -06:00
Mike Place
3807cd5c4e Merge pull request #27496 from blueyed/fix-gitpython-version 
Fix version reporting of gitpython
 2015-09-29 09:31:48 -06:00
Erik Johnson
057fd0729d Merge pull request #27502 from ticosax/backport-test-from-develop 
Add test to check we don't call inspect_image on absent images.
 2015-09-29 10:15:09 -05:00
rallytime
441241eb90 Change sync_outputters to sync_output for consistency, but alias sync_outputters 2015-09-29 08:16:15 -06:00
Nicolas Delaby
fadd9bd43e Add test to check we don't call inspect_image on absent images. 2015-09-29 15:53:29 +02:00
Erik Johnson
f3da6e4bb3 Merge pull request #27497 from blueyed/dockerng-fix-404-private-forced 
dockerng: fix image_present for forced, non-existent image
 2015-09-29 08:49:46 -05:00
Daniel Hahler
e3c66cea3a dockerng: fix image_present for forced, non-existent image 
With a non-existent image, which is forced, the call to `inspect_image`
will raise a `CommandExecutionError`: "Unable to get info for image".

This commit changes it to only call `inspect_image` for existing images.
 2015-09-29 14:39:27 +02:00
Daniel Hahler
d8969363c8 Fix version reporting of gitpython 
The module is called `git`, not `gitpython`.

Without this, the version for `gitpython` will not show up with
`salt-call --versions-report`.
 2015-09-29 13:27:48 +02:00
Ryan Lane
5e25454fc1 Followups for using __states__ 2015-09-28 16:36:28 -07:00
Mike Place
5de2ee35ab Minor doc fixup. 
Language and grammar changes.
 2015-09-28 17:19:21 -06:00
ZhiFeng Hu
af656c7e87 Doc: copy key to server via ssh-copy-id 
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
 2015-09-28 17:19:09 -06:00
rallytime
105528720b Outputters should sync to output, not outputters, on the minion. 
Otherwise, the loader won't pick them up.

Fixes #17103
 2015-09-28 16:53:53 -06:00
Mike Place
284984e6ba Merge pull request #27411 from terminalmage/issue27205 
Fix invocation of git.config_get and git.config_set
 2015-09-28 16:53:01 -06:00
Erik Johnson
cbcb5475b6 Merge pull request #27477 from terminalmage/issue27217 
Don't append role to hash_cachedir
 2015-09-28 17:26:34 -05:00
Nicole Thomas
927874d316 Merge pull request #27469 from twangboy/fix_27433 
Added quotes to version numbers example
 2015-09-28 15:54:43 -06:00
Nicole Thomas
2f71833260 Merge pull request #27474 from whiteinge/docs-pymongo-fix 
Add fake pymongo version attribute for the docs
 2015-09-28 15:49:25 -06:00
Nicolas Delaby
b184faa55b Enforce usage of host_config and require docker-py>=1.4.0 2015-09-28 23:24:57 +02:00
Nasenbaer
c185e99970 Second attempt to fix #27217 2015-09-28 15:46:46 -05:00
Ryan Lane
a01f8ac62c Use __states__ for calls to other boto states 2015-09-28 13:44:08 -07:00
Niels Abspoel
a8f2dad1be fix locale on opensuse and suse #27438 2015-09-28 22:35:41 +02:00
Mike Place
9202f956f3 Merge pull request #27466 from blueyed/fix-gnupg-version 
Fix version reporting of python-gnupg and mysql-python
 2015-09-28 14:25:00 -06:00
Mike Place
382a53403f Merge pull request #27467 from cachedout/lint_27375 
file.managed: check contents_{pillar|grain} result
 2015-09-28 14:22:16 -06:00
Erik Johnson
fa70ef2e31 salt.utils.gitfs: Don't use close_fds=True on Windows 
Fixes #27220.
 2015-09-28 14:52:08 -05:00
Seth House
64b54e668a Add fake pymongo version attribute for the docs 
This bypasses the following traceback when building the docs.

File "/Users/shouse/src/salt/salt/salt/returners/mongo_future_return.py", line 72, in <module>
    version = '.'.join(version.split('.')[:2])
TypeError: 'Mock' object has no attribute '__getitem__'
 2015-09-28 13:51:31 -06:00
Mike Place
5e745ad6da Change recommeded schema for data field in mysql event table 
Closes #27447
 2015-09-28 13:32:02 -06:00
Mike Place
6d8e9af297 Merge pull request #27465 from ticosax/fix-dockerng-cmd 
Fix usage of dockerng "cmd" was #27459
 2015-09-28 13:27:41 -06:00
Mike Place
aefe6d794a Merge pull request #27417 from whiteinge/bp-25243 
Backport #25243 into 2015.8
 2015-09-28 13:15:53 -06:00
Mike Place
0bc37c0d41 Fix test 2015-09-28 12:57:22 -06:00
twangboy
a996ea46e2 Added quotes to version numbers example 
Fixes #27433
 2015-09-28 12:52:59 -06:00
Mike Place
4e54a98f5e Lint #27375 2015-09-28 12:46:28 -06:00
Daniel Hahler
9c1454fe59 Fix version reporting of mysql-python 
The module is called `MySQLdb`, not `mysql-python`.

Without this, the version for `mysql-python` will not show up with
`salt-call --versions-report`.
 2015-09-28 20:13:08 +02:00