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

17815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
bcacf2c668 Merge pull request #7266 from techhat/novafix 
Fixing openstack nova error with rxtx_factor
 2013-09-16 07:55:50 -07:00
Joseph Hall
cd6cc50d12 Same kind of problem with minDisk and minRam 2013-09-16 08:35:25 -06:00
Joseph Hall
4993816bdd Sometimes rxtx_factor isn't there 2013-09-16 08:22:31 -06:00
Thomas S Hatch
68eb1a50d0 Merge pull request #7265 from s0undt3ch/develop 
Don't include authorship in generated documentation.
 2013-09-16 07:16:34 -07:00
Pedro Algarvio
454a04fd49 Don't include authorship in generated documentation. 2013-09-16 12:01:02 +01:00
Thomas S Hatch
743561d7a1 Merge pull request #7263 from terminalmage/new-module-docs 
Add versionadded directives for new states
 2013-09-15 19:31:28 -07:00
Thomas S Hatch
f070ba9979 Merge pull request #7261 from terminalmage/issue7250 
Fix docstring in alternatives module
 2013-09-15 19:31:10 -07:00
Thomas S Hatch
c7b7cce0d9 Merge pull request #7260 from terminalmage/issue7253 
Don't make selinux state available if selinux module isn't
 2013-09-15 19:30:23 -07:00
Thomas S Hatch
64b6c5152a Merge pull request #7259 from terminalmage/issue7257 
Fix regression in pkg.latest_version
 2013-09-15 19:29:28 -07:00
Thomas S Hatch
d0e4bbef0b Merge pull request #7258 from terminalmage/docs 
Audit module documentation (X to Z + new mac modules)
 2013-09-15 19:28:56 -07:00
Thomas S Hatch
a6d4314640 Merge pull request #7254 from stevearc/queued_states 
Adding an option to queue state commands instead of failing immediately
 2013-09-15 19:27:48 -07:00
Erik Johnson
9c70b8d860 Add versionadded directives for new states 2013-09-15 19:24:37 -05:00
Erik Johnson
e29af84092 Remove other kwargs checks that would cause tracebacks 
We need to do better arg checking, but this is not the way to go about
it.
 2013-09-15 18:58:53 -05:00
Erik Johnson
648b933a3f Fix more top-level docsrings to improve docs 2013-09-15 18:54:19 -05:00
Erik Johnson
0beeb2eb28 Add top docstring to portage_config module 
This makes the autosummary on
http://docs.saltstack.com/ref/modules/all/index.html look better.
 2013-09-15 18:39:27 -05:00
Erik Johnson
2c5a44b01d Add additional note to selinux state docstring 2013-09-15 18:31:13 -05:00
Pedro Algarvio
23c586b439 Merge pull request #7262 from terminalmage/issue7255 
Correct docstring for salt.modules.dnsutil.hosts_remove
 2013-09-15 16:25:19 -07:00
Erik Johnson
7c9a25c68c Correct docstring for salt.modules.dnsutil.hosts_remove 
It looks like this function might have changed names at one point and
the docstring was never updated, or the docstring was just incorrect to
begin. This fixes CLI example to match the correct function name.

Resolves #7255.
 2013-09-15 18:18:46 -05:00
Erik Johnson
0281b6bc50 Fix docstring in eselect module 
This also makes the autosummary used in
http://docs.saltstack.com/ref/modules/all/ look better.
 2013-09-15 18:05:55 -05:00
Erik Johnson
3cc0cec9f5 Fix docstring in alternatives module 
This makes the autosummary in http://docs.saltstack.com/ref/modules/all/
have a proper summary text.
 2013-09-15 18:04:52 -05:00
Erik Johnson
6e53ccbce8 Don't make selinux state available if selinux module isn't 
Also, add notes to top-level docstring explaining that the setsebool and
semanage commands need to be available in order for the module to work,
and note which packages provide these on RHEL-based distros.

Resolves #7253.
 2013-09-15 17:33:03 -05:00
Erik Johnson
ab29cc8cc1 Fix regression in apt module 
This fixes a regression introduced in bd72e44. Resolves #7257.
 2013-09-15 16:58:03 -05:00
Erik Johnson
a1b2ad3874 Audit module documentation (X to Z + new mac modules) 
This commit completes the work started in 7d4739d, putting CLI examples
in bash code-blocks to give them syntax highlighting on
docs.saltstack.com. Combined with 5094719, this both improves the
documentation on the website, as well as the messages seen when using
sys.doc.
 2013-09-15 15:53:36 -05:00
Pedro Algarvio
afc349132a Merge pull request #7256 from s0undt3ch/develop 
Use raw strings with backslashes.
 2013-09-15 04:37:46 -07:00
Pedro Algarvio
a95f9a4943 Use raw strings with backslashes. 2013-09-15 12:36:58 +01:00
Pedro Algarvio
742e583734 Merge pull request #7252 from terminalmage/sysdoc-rst-replace 
Modify sys.doc to replace rst directives
 2013-09-15 04:18:38 -07:00
Steven Arcangeli
e523025bb6 Adding an option to queue state commands instead of failing immediately 2013-09-14 23:29:20 -07:00
Thomas S Hatch
30bc069574 Add halite startup hooks into the master 2013-09-14 23:10:06 -06:00
Erik Johnson
5094719cb7 Modify sys.doc to replace rst directives 
This commit modifies sys.doc so that the rst directives within it look
better on the CLI when the docs are printed to the terminal.
 2013-09-15 00:00:49 -05:00
Thomas S Hatch
8fccb5cce7 Merge pull request #7248 from jcockhren/add_global_flag_git_config 
Add global flag git config
 2013-09-14 20:39:39 -07:00
Pedro Algarvio
b8dcf5e085 Merge pull request #7251 from terminalmage/docs 
Audit module documentation (U to W)
 2013-09-14 20:26:55 -07:00
Erik Johnson
79557cda84 Audit module documentation (U to W) 
This commit continues the work started in 7d4739d, putting CLI examples
in bash code-blocks to give them syntax highlighting on
docs.saltstack.com.
 2013-09-14 22:15:45 -05:00
Jurnell Cockhren
715c152815 Allow user to use the '--global' flag for git config settings. 
This resolves #7156
By default 'is_global' is set to False.
Side Effects: Each call to config_set includes the '--local' or '--global'
flags.
 2013-09-14 20:55:54 -05:00
Jurnell Cockhren
909f0884a8 Merge remote-tracking branch 'upstream/develop' into develop 2013-09-14 20:35:43 -05:00
Pedro Algarvio
5b1f0bcb35 Merge pull request #7246 from s0undt3ch/develop 
Add missing import.
 2013-09-14 11:00:00 -07:00
Pedro Algarvio
87e508f872 Add missing import. 2013-09-14 18:59:31 +01:00
Pedro Algarvio
fbd0e622cc Merge pull request #7245 from ranl/modjk 
fixing modjk.recover_all function
 2013-09-14 10:42:31 -07:00
ranl
a44311a83b Merge remote-tracking branch 'upstream/develop' into modjk 
Conflicts:
	salt/modules/modjk.py
 2013-09-14 19:34:16 +02:00
ranl
f0d918e41c fixing modjk.recover_all function 
(08ddd2ae6d (commitcomment-4093277))
 2013-09-14 19:08:02 +02:00
Joseph Hall
fc94c02204 Merge pull request #7241 from gravyboat/develop 
updates to puppet.py for additional examples, and a fixed comma in cmd.py
 2013-09-14 07:01:31 -07:00
Pedro Algarvio
e538234431 Merge pull request #7243 from s0undt3ch/hotfix/lint 
Lint fixes
 2013-09-14 03:30:57 -07:00
Pedro Algarvio
e50e6de1ba Add missing comma, forgotten in d4b021f2. 2013-09-14 11:29:06 +01:00
Pedro Algarvio
76dd69f3aa Remove white-space. 2013-09-14 11:28:46 +01:00
Forrest Alvarez
59d0a25278 updated puppet.py with an example that has more than one argument, also added missing comma on line 663 that was causing cmd.py to fail 2013-09-14 05:55:33 +00:00
Thomas S Hatch
4a2660a618 Merge pull request #7240 from s0undt3ch/hotfix/minion-config 
Default options do not include `config_dir`. It really should be `conf_file`
 2013-09-13 22:17:50 -07:00
Thomas S Hatch
302e317542 Merge pull request #7237 from hulu/avoid-pip-shadowing 
avoid shadowing `version()` in pip.list_()
 2013-09-13 22:17:21 -07:00
Thomas S Hatch
c457b62206 Merge pull request #7236 from hulu/string-shadowing 
avoid shadowing in salt/utils/__init__.py
 2013-09-13 22:16:57 -07:00
Thomas S Hatch
e19b813f8b Merge pull request #7235 from hulu/top-avoid-shadow 
avoid shadowing `top` within state.show_top()
 2013-09-13 22:16:41 -07:00
Thomas S Hatch
c69558c883 Merge pull request #7234 from hulu/lxc-unused-arg 
lxc_gen_config(): rm unused arg `name`
 2013-09-13 22:16:15 -07:00
Thomas S Hatch
75e003b62f Merge pull request #7224 from dlanderson/shell_test_retcodes 
Add with_retcode option to ShellCase.run_call().
 2013-09-13 22:15:32 -07:00