valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,721 Commits 24 Branches 182 Tags 341 MiB
f02553bfc5
Commit Graph

18721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
f02553bfc5 Merge pull request #7742 from shadowfax-chc/hgfs-tags-issue 
Hgfs tags issue
 2013-10-11 08:01:06 -07:00
Thomas S Hatch
ee3c979595 Merge pull request #7741 from dlanderson/fix_issue_5449 
Restore the pillar[master][file_roots] when returning the pillar
 2013-10-11 08:00:44 -07:00
Pedro Algarvio
22e22b93f7 Merge pull request #7753 from hvnsweeting/fix_file_state 
except right exception that file module raised
 2013-10-11 07:23:36 -07:00
Pedro Algarvio
e1bc7bb53a Merge pull request #7744 from cameronboehmer/client-caller-doc-typo 
refer to Caller instead of LocalClient in salt.client.Caller docstring
 2013-10-11 07:07:30 -07:00
hvnsweeting
cfb7225d2a except right exception that file module raised 2013-10-11 16:17:20 +07:00
Seth House
3a22b3af38 Removed special case for uppercase attributes from Mock object 
I'm not sure what the original intent of this behavior was but we don't
appear to be using it and it breaks the infinite chain-ability of the
Mock() object by not returning a chain-able object. E.g.:
``Mock().thing.thing.thing...`` works but ``Mock().thing.Thing.thing``
breaks.

Fixes #7725.
 2013-10-10 23:57:19 -04:00
Seth House
b75fc3ed3c Updated Sphinx makefile for latest Sphinx and i18n additions 2013-10-10 23:57:19 -04:00
Cameron Boehmer
11da0f8ac2 refer to appropriate class (self) in the Caller docstring 2013-10-10 16:09:48 -07:00
shadowfax-chc
3feb1f379e Fixed typo in comment 2013-10-10 18:22:41 -04:00
shadowfax-chc
344a03eed8 Fixed typos and bugs in hgfs. Fixes #7687 2013-10-10 18:20:05 -04:00
David Anderson
25b0e3f89e Restore the pillar[master][file_roots] when returning the pillar 2013-10-10 15:12:00 -06:00
Colton Myers
02cf488059 Merge pull request #7740 from basepi/minioncaching 
Actually pass minion_id to minion_id
 2013-10-10 13:30:59 -07:00
Colton Myers
05eddd5e1c Fix typo 2013-10-10 14:29:21 -06:00
Thomas S Hatch
b19a9a29a9 Merge pull request #7739 from basepi/minioncaching 
Make sure the minion ID is not guessed except by the actual minion
 2013-10-10 13:21:24 -07:00
Colton Myers
bcc2f41b76 Have the minion actually generate its ID 2013-10-10 14:13:16 -06:00
Joseph Hall
cf423c10e2 Merge pull request #7738 from hulu/win-sys-unused-imports 
rm unused imports from states/win_system.py
 2013-10-10 12:29:43 -07:00
Chris Rebert
71ba9329b2 rm unused imports from states/win_system.py 2013-10-10 12:22:01 -07:00
Joseph Hall
5fe355d0a8 Merge pull request #7737 from cvrebert/patch-2 
tomcat module: rm trailing whitespace
 2013-10-10 12:21:26 -07:00
Chris Rebert
8d10941498 tomcat module: rm trailing whitespace 2013-10-10 12:21:03 -07:00
Thomas S Hatch
90f29ed43a Merge pull request #7736 from khrisrichardson/develop 
rename code:: to code-block::
 2013-10-10 11:08:40 -07:00
Thomas S Hatch
52a953c488 Merge pull request #7731 from vvoody/fixed-raw-command-expanded 
salt-ssh: keep raw command to be executed remotely unexpanded
 2013-10-10 11:07:26 -07:00
Khris Richardson
421600f51d rename code:: to code-block:: 2013-10-10 13:00:29 -05:00
Colton Myers
271c045b3a Don't generate minion id by default 2013-10-10 11:09:43 -06:00
Seth House
ebdc3af981 Improved wonky overstate CLI example 2013-10-10 12:52:12 -04:00
Colton Myers
061c7379de Merge pull request #7734 from basepi/minioncaching 
Make root_dir logic more robust/cross-platform
 2013-10-10 09:21:31 -07:00
Colton Myers
02b474f31d Make root_dir logic more robust/cross-platform 2013-10-10 10:18:08 -06:00
Joseph Hall
ec3fb9303b Merge pull request #7732 from cssug/patch-1 
Update tomcat.py
 2013-10-10 08:14:28 -07:00
中国SaltStack用户组(China SaltStack User Group)
39597e7f05 Update tomcat.py 
adjust the description for sphinx
 2013-10-10 22:53:17 +08:00
vvoody
7b76c1e57d salt-ssh: keep raw command to be executed remotely unexpanded, e.g. 
salt-ssh -r 'ls ~' won't be executed as 'ls /home/localuser',
          but correctly 'ls /home/remoteuser/'
 2013-10-10 22:03:28 +08:00
Joseph Hall
ae46041b1b Merge pull request #7728 from Lothiraldan/patch-1 
Fix cli example of salt.modules.network.arp
 2013-10-10 05:08:59 -07:00
Boris Feld
7fd2c25cde Fix cli example of salt.modules.network.arp 
Remove an useless '*' symbol in cli example of salt.modules.network.arp
 2013-10-10 14:03:05 +02:00
Joseph Hall
b322026d2e Merge pull request #7727 from feth/patch-1 
fix zypper install interface (missing an escape)
 2013-10-10 04:47:20 -07:00
Feth Arezki
f3ceb1edf3 Update zypper.py 
On my setup (OpenSuSE 11.4), this command is issued with its \n unescaped.
It works with double escaping of the \n, that is \\n.
 2013-10-10 12:41:20 +02:00
Pedro Algarvio
36f34f207b Merge pull request #7724 from sibsibsib/patch-1 
fixes CommandExecutionError when using pip state find_links with directo...
 2013-10-09 21:31:29 -07:00
Pedro Algarvio
554e313286 Merge pull request #7720 from terminalmage/windows-net-states 
Add win_system state, refine win_ntp module
 2013-10-09 21:26:06 -07:00
sib
ace1ad4e12 fixes CommandExecutionError when using pip state find_links with directory path 
If the directory exists, an error will be thrown instead of passing it to the pip command line.
 2013-10-10 00:19:10 -04:00
Pedro Algarvio
689178f4d6 Merge pull request #7723 from terminalmage/minion-id-caching-fix 
Fix minion ID caching for minions using non-default root_dir
 2013-10-09 21:04:48 -07:00
Erik Johnson
af2cf8a6c2 Fix minion ID caching for minions using non-default root_dir 
Caught this in my testing since I run my development testing in
virtuialenvs and need to use the root_dir option.

This commit uses the root_dir minion option when deriving a location for
the minion ID cache file. It also cleans up some stuff that drives
pylint crazy like single-letter variable names, and generic exception
catching in try/except.
 2013-10-09 22:31:54 -05:00
Erik Johnson
ab4f8ef0c1 Merge pull request #7722 from cvrebert/patch-2 
pillar.django_orm: fix misspelled function name
 2013-10-09 19:52:47 -07:00
Erik Johnson
86567f7083 Merge pull request #7721 from cvrebert/patch-1 
ntp state: rm unused import
 2013-10-09 19:51:01 -07:00
Erik Johnson
fee90d6715 Add CLI examples to fix travis breakage 2013-10-09 21:49:09 -05:00
Chris Rebert
1510596549 pillar.django_orm: fix misspelled function name 2013-10-09 19:47:45 -07:00
Chris Rebert
e0ca8c8f98 ntp state: rm unused import 2013-10-09 19:46:55 -07:00
Erik Johnson
cf1a878ed6 Add versionadded directives to new modules/states 2013-10-09 21:45:02 -05:00
Erik Johnson
3ddb416a53 Remove inapplicable exclude-members directive 2013-10-09 21:31:05 -05:00
Erik Johnson
2cb6b1c8a3 Suppress function aliases from appearing in docs 2013-10-09 21:29:05 -05:00
Erik Johnson
e9de4fde81 Alias set_computer_description to set_computer_desc 2013-10-09 21:20:19 -05:00
Erik Johnson
fc9afc708a Fix system.set_computer_desc 
This would always return that the description had been changed,
resulting in the corresponding state always thinking the change had been
successful. This commit fixes that behavior.
 2013-10-09 21:20:19 -05:00
Erik Johnson
46520512a6 Add win_ntp module to docs 2013-10-09 21:00:37 -05:00
Erik Johnson
10b5d8f0e1 Alias get_computer_description to get_computer_desc 2013-10-09 20:59:50 -05:00