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
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
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
Thomas S Hatch
781bfe2455
remove reduntant faulty test
2013-12-12 15:18:36 -07:00
Thomas S Hatch
04222e0265
Merge pull request #9221 from basepi/prereqerror8235
...
Error out if prereq is not formed as a list, Fix #8235
2013-12-12 14:22:13 -08:00
Colton Myers
c6d000f7e7
Make the change on *both* verify_high calls
2013-12-12 15:14:53 -07:00
Thomas S Hatch
ea22369481
lint fixes for mysql tests
2013-12-12 15:13:20 -07:00
Thomas S Hatch
7957455ff9
some pylint fixes for mysql tests
2013-12-12 14:56:45 -07:00
Joseph Hall
a1ae2867d3
Merge pull request #9220 from techhat/issue9219
...
Correct the username and ssh key file variable names for GCE
2013-12-12 14:02:22 -08:00
Joseph Hall
bb11845d8b
Correct the username and ssh key file variable names for GCE
2013-12-12 15:01:35 -07:00
Thomas S Hatch
0f2a7974ae
Fix syntax issue in stateconf test
2013-12-12 14:52:14 -07:00
Thomas S Hatch
417c3ef439
Merge pull request #9150 from regilero/mysql_additions
...
Mysql additions
2013-12-12 13:51:56 -08:00
Colton Myers
3398563005
Force prereq to be formed as a list
2013-12-12 14:47:50 -07:00
Colton Myers
f899f0e5a9
Merge pull request #9218 from basepi/whichtrace
...
Only log salt.utils.which failures in trace (too verbose)
2013-12-12 13:47:31 -08:00
Colton Myers
736170cbf1
Only log salt.utils.which failures in trace (too verbose)
2013-12-12 14:47:00 -07:00
Thomas S Hatch
081af04c81
Fix #9217
2013-12-12 14:37:23 -07:00
regilero
2e48812cfa
Merge remote-tracking branch 'upstream/develop' into mysql_additions
2013-12-12 22:10:50 +01:00
regilero
9a0d33cb83
Small Lint fix
2013-12-12 22:10:32 +01:00
regilero
9eeb8940a4
Be nice with sphinx, in case of, keep password example in ascii
2013-12-12 21:58:07 +01:00
regilero
f1fc1557ff
MySQL module: replace some modula string by format ones, add big comments about the way escapes are working in this module.
2013-12-12 21:54:06 +01:00
Joseph Hall
ceab83fcef
Merge pull request #9214 from ffzg/develop
...
Always generate same order of bonding options
2013-12-12 12:29:56 -08:00
regilero
f1b6b4af55
MySQL tests: add a localhost target on mysqladmin test to check for MySQL server presence
2013-12-12 21:23:52 +01:00
Luka Blaskovic
8db3b46069
Always generate same order of bonding options
...
When generating bonding interface on Debian bonding options are ordered
"randomly" producing unneded interface updates.
2013-12-12 20:23:46 +01:00
Thomas S Hatch
0880c73c43
load in a fake config.get function to fix tests
...
Mocking may be a better way of doing this, but since these are
generated at the top of the test I felt that this solution was also viable
2013-12-12 11:50:53 -07:00
Aditya Kulkarni
0d5bd66f15
Merge pull request #9211 from pass-by-value/docstring_move
...
Move docstring to the right function
2013-12-12 10:55:08 -08:00
Aditya Kulkarni
a618ba2026
Move docstring to the right function
2013-12-12 13:49:02 -05:00
Joseph Hall
2d687eace1
Merge pull request #9210 from techhat/issue9202
...
Force jumps and their arguments to always appear last
2013-12-12 10:45:45 -08:00
Joseph Hall
6dc9ad9c04
Force jumps and their arguments to always appear last
2013-12-12 11:43:59 -07:00
Thomas S Hatch
800cebaeba
Merge pull request #9209 from WillPlatnick/fix_rbenv_update
...
Fix rbenv updating
2013-12-12 10:38:27 -08:00
Thomas S Hatch
30d6e2fabb
Merge pull request #9207 from pass-by-value/signature_addon
...
Tweak signature api call
2013-12-12 10:35:04 -08:00
Thomas S Hatch
dd16fb9ec0
Merge pull request #9208 from cachedout/roots_gitfs_testing
...
Extreme-self-tab-lart
2013-12-12 10:34:08 -08:00
Mike Place
6c991e3216
Extreme-self-tab-lart
2013-12-12 11:31:11 -07:00
Will Platnick
112a212b93
Fix rbenv updating
2013-12-12 13:29:38 -05:00
Thomas S Hatch
122c5af528
syntax fix
2013-12-12 11:25:46 -07:00
