Thomas S Hatch
c035100a6c
Merge pull request #9223 from kaithar/feature/expose-global-highstate
...
Expose global highstate for the benefit of pydsl
2013-12-13 13:09:21 -08:00
Thomas S Hatch
ecca2659ba
Merge pull request #9222 from cachedout/overstate_test
...
Overstate test
2013-12-13 13:03:53 -08:00
Thomas S Hatch
2cec7899de
Always use is_windows for speed and standardization
2013-12-13 13:54:29 -07:00
Thomas S Hatch
627f358b57
Merge pull request #9215 from uvsmtid/develop
...
Use uppercase for `OS` environment variable
2013-12-13 12:57:22 -08:00
Thomas S Hatch
c30e721cf2
Merge pull request #9212 from terminalmage/issue9182
...
Add an output_loglevel argument to cmd.run*, cmd.retcode
2013-12-13 12:56:06 -08:00
Joseph Hall
19f830dfa3
Merge pull request #9238 from techhat/docfix
...
Put cloud providers in alphabetical order
2013-12-13 12:20:11 -08:00
Joseph Hall
8593da4048
L comes after J
2013-12-13 13:19:40 -07:00
Joseph Hall
3a0bbabb83
Put cloud providers in alphabetical order
2013-12-13 13:18:00 -07:00
Seth House
0bd0c8f3b8
rST fixes
2013-12-13 12:19:13 -07:00
Mike Place
7e2c897a36
Check successful prereq
2013-12-13 11:59:37 -07:00
Mike Place
82e0e2efe0
Check failed prereqs.
2013-12-13 11:50:51 -07:00
Thomas S Hatch
a7eae3ba92
Merge pull request #9235 from felskrone/add-default-rsa_key-length
...
added default value of 4096 bits to config for master and minion RSA-Key
2013-12-13 10:25:35 -08:00
Pedro Algarvio
507f3aaa97
Typo.
2013-12-13 17:14:08 +00:00
Pedro Algarvio
f2e41ac0a0
Merge pull request #9233 from cachedout/doc_style_pylint
...
Add instructions on using pylint to the style coding style guidelines
2013-12-13 09:13:05 -08:00
Mike Place
d22161eebc
Add instructions on using pylint to the Salt style coding style guidelines.
2013-12-13 10:11:23 -07:00
vs
bb0e10a0b3
added default value of 4096 bits to config for master and minion RSA-Key
...
modified key-generation for master and minion to use self.opts['keysize'] instead of defaulting to 4096
2013-12-13 17:50:11 +01:00
Mike Place
827514098f
More tests.
2013-12-13 09:45:05 -07:00
Mike Place
857cacf26e
format instead of printf
2013-12-13 09:37:39 -07:00
Mike Place
eeba7dffbe
Merge pull request #9230 from Psycojoker/develop
...
more debug verbose output for git.latest
2013-12-13 08:35:08 -08:00
Laurent Peuch
fc50ec3439
more debug verbose output for git.latest
2013-12-13 17:19:44 +01:00
Luka Blaskovic
44d0634e9f
Add complete option parsing for Debian bridge interfaces
...
Inspired by bond option parsing.
Bridge option checks are based on debian man page:
http://manpages.debian.net/cgi-bin/man.cgi?query=bridge-utils-interfaces
2013-12-13 16:18:47 +01:00
Luka Blaskovic
b200697ea6
Fix bond and bridge option rendering order, add more bridge options
...
Better way of handling option ordering in bond and bridge interfaces
and add missing bridge options.
2013-12-13 16:16:22 +01:00
Luka Blaskovic
de746c7073
Revert "Always generate same order of bonding options"
...
This reverts commit 8db3b46069
2013-12-13 16:16:22 +01:00
Joseph Hall
c2ed034d96
Merge pull request #9229 from techhat/docfix
...
Minor typo fixes
2013-12-13 06:52:03 -08:00
Joseph Hall
750a28f5ef
Minor typo fixes
2013-12-13 07:50:46 -07:00
Pedro Algarvio
711f02066b
Merge pull request #9227 from blackduckx/develop
...
Fix for bug #9128 : issue with salt-master ttys with lvdisplay command
2013-12-13 03:07:31 -08:00
Frédéric Brin
41f8ccd487
Fix for bug #9128 : stdin issue with lvdisplay command
...
lvm related command breaks while checking the filedescriptor flags.
Setting flags to 'r+' fixes it.
'r+' Open for reading and writing. The stream is positioned at the
beginning of the file. (cf fopen man page)
2013-12-13 12:01:54 +01:00
Frédéric Brin
bfd9dcbe60
Revert "Fix for bug #9128 : issue with salt-master ttys with lvdisplay command"
...
This reverts commit 7ca28147a7
2013-12-13 12:01:20 +01:00
Frédéric Brin
f36ad46394
Revert "Updated fix for #9128 "
...
This reverts commit 29f86cbc01
2013-12-13 12:01:20 +01:00
Frédéric Brin
29f86cbc01
Updated fix for #9128
...
Better use 'r+' while opening stdin as recommanded by s0undt3ch
2013-12-13 10:12:27 +01:00
Pedro Algarvio
27a32c5849
Catch the proper exception. White-space fixes.
2013-12-13 08:12:00 +00:00
Seth House
78363be2e9
rST fixes
2013-12-12 23:29:57 -07:00
Seth House
1b83d3d16c
Added the new salt_projects doc to the TOC
2013-12-12 23:29:56 -07:00
Seth House
e6ed5e2889
Added docs for new execution and state modules
2013-12-12 23:29:56 -07:00
Seth House
fec0671fe3
rST fixes
2013-12-12 23:29:56 -07:00
Seth House
e252ee8f8a
Updated docs for buildout -> zcbuildout rename
2013-12-12 23:29:56 -07:00
Joseph Hall
738fb32e03
Merge pull request #9226 from techhat/cloudmodules
...
Add more detail on writing new cloud modules
2013-12-12 22:21:25 -08:00
Joseph Hall
a1a9281417
Add more detail on writing new cloud modules
2013-12-12 23:20:20 -07:00
Kaithar
b1ac292873
Made state_highstate more useful.
2013-12-13 05:47:25 +00:00
Seth House
2ef3953242
Merge pull request #9225 from gravyboat/develop
...
Fixed a typo in the Digital Ocean docs, and added a link over to their docs.
2013-12-12 21:37:50 -08:00
Forrest Alvarez
231626797c
Merge remote branch 'upstream/develop' into develop
2013-12-13 05:21:55 +00:00
Forrest Alvarez
9a7dcc4d60
Added a link over to the digital ocean docs.
2013-12-13 05:21:41 +00:00
Seth House
36f70bdcec
Correctly pass kwargs through to wheel.call_func
...
The change in 1de6204
2013-12-12 22:03:38 -07:00
Kaithar
5836b1b040
Missing newline
2013-12-13 04:53:47 +00:00
Kaithar
866bc66bac
Unit test for including a state multiple times using pydsl.
2013-12-13 05:41:38 +00:00
Kaithar
6bd6c86783
Expose the highstate while we're building it, to let pydsl include correctly.
2013-12-13 05:40:18 +00:00
Forrest Alvarez
b6c9fe7a5c
Fixed a typo in the title of the digital ocean docs.
2013-12-13 04:52:10 +00:00
Thomas S Hatch
444b203072
Pass the psudo funcs into the renderer
2013-12-12 21:47:42 -07:00
Thomas S Hatch
39e849c314
pylint fixes
2013-12-12 20:51:28 -07:00
Mike Place
f42a956f42
Pylint
2013-12-12 17:06:12 -07:00
