Thomas S Hatch
e7fcb374e8
pylint fixes for debian_ip
...
@garethgreenaway you did MUCH better on the pylint this round,
these fixes are very minor and almost all represent some updates
to the code that get missed a lot, thanks!
2013-12-06 10:20:03 -07:00
Thomas S Hatch
3290d4f000
Fix #9083
2013-12-06 09:50:46 -07:00
Thomas S Hatch
0503f138bc
Merge pull request #9082 from Psycojoker/develop
...
more detailed output when a command fails
2013-12-06 08:54:51 -08:00
Thomas S Hatch
ba3e364931
Fix some style issues wrt #9081
2013-12-06 09:47:40 -07:00
John Spray
0376a5c42a
Wait for new time_t before updating AES key file
...
This is a mitigation for issue 8263, wherein the master
experiences a communications failure when multiple
key updates happen in one second. We reduce the chance
of this by checking time() against the mtime of the file
and waiting until they are not equal.
2013-12-06 09:46:45 -07:00
Thomas S Hatch
a5d8fbbf5b
Minior pylint fix per #9071
2013-12-06 09:33:20 -07:00
Thomas S Hatch
5684b8c3b8
Merge pull request #9071 from mikn/wheel-patch
...
Making opts optional for the Wheel python API. Addresses #9069
2013-12-06 08:38:38 -08:00
Thomas S Hatch
3eb5990d8c
make the file it not already there
2013-12-06 09:31:43 -07:00
Thomas S Hatch
f70b552d36
Merge pull request #9068 from mikn/develop
...
Mending some logical hula hoops in wheel/key.py. Fixing #9055
2013-12-06 08:36:55 -08:00
Thomas S Hatch
f360aa53b6
single quotes
2013-12-06 09:27:32 -07:00
Thomas S Hatch
7a17804653
single quotes
2013-12-06 09:25:33 -07:00
Thomas S Hatch
f5810fdc79
Merge pull request #9057 from ticosax/add-partial-support-docker-v1.6-api
...
Add partial support docker v1.6 api
2013-12-06 08:29:43 -08:00
Thomas S Hatch
eeee90ec8c
Fix opts test lookup
2013-12-06 09:18:31 -07:00
Thomas S Hatch
7407f8b75b
Merge pull request #9043 from garethgreenaway/develop
...
Adding support to manage networks on Debian/Ubuntu systems.
2013-12-06 08:21:31 -08:00
Pedro Algarvio
250a87acf5
Remove empty lines from the end of the file.
2013-12-06 16:07:29 +00:00
Laurent Peuch
e6e9a6a38b
more detailed output when a command fails
2013-12-06 17:06:12 +01:00
Joseph Hall
77c128a254
Merge pull request #9079 from s0undt3ch/develop
...
Fix lint issues.
2013-12-06 06:05:00 -08:00
Pedro Algarvio
d8d4400107
Remove trailing white-space
2013-12-06 13:57:52 +00:00
Pedro Algarvio
086315baff
Fix white-space lint issues.
2013-12-06 13:57:08 +00:00
Pedro Algarvio
2562c7cd85
Fix white-space lint issues.
2013-12-06 13:55:18 +00:00
Pedro Algarvio
832394c8f4
Fix variable naming issues and catch proper exceptions.
2013-12-06 13:49:04 +00:00
Pedro Algarvio
3f5f380619
Rename internal envs in order not to hide the method.
2013-12-06 13:35:55 +00:00
Pedro Algarvio
9001913ffa
Remove trailing white-space.
2013-12-06 13:30:57 +00:00
Pedro Algarvio
f7d7ed0b4b
Remove last empty line
2013-12-06 13:30:21 +00:00
Pedro Algarvio
1293b0f29d
Fix NameError.
2013-12-06 13:29:00 +00:00
Pedro Algarvio
224ac8ddf7
White space lint issues.
2013-12-06 13:28:27 +00:00
Pedro Algarvio
0fbc71c5b3
Merge pull request #9078 from techhat/digitalocean
...
Make digital ocean handle errors a little better
2013-12-06 05:20:41 -08:00
Joseph Hall
0656e10fb0
Make digital ocean handle errors a little better
2013-12-06 06:18:36 -07:00
Nicolas Delaby
3245221ffd
Add notes about docker-py version
2013-12-06 13:44:37 +01:00
Mikael Knutsson
e3323bf63d
Making opts optional for the Wheel python API. Addresses #9069
2013-12-06 10:54:54 +01:00
Nicolas Delaby
e25c5f59e1
Follow Coding Style: Use simple quotes to wrap docstring.
2013-12-06 10:23:36 +01:00
Mikael Knutsson
2a2354299f
Mending some logical hula hoops in wheel/key.py. Fixing #9055
2013-12-06 09:53:49 +01:00
Thomas S Hatch
870f150129
Merge pull request #9048 from holmboe/patch-1
...
Avoid line continuation
2013-12-05 23:13:04 -08:00
Thomas S Hatch
537df714af
Merge pull request #9045 from olenz/develop
...
If a specific repo is requested, force the installation.
2013-12-05 23:10:54 -08:00
Thomas S Hatch
69dc9f7e1c
Merge pull request #9040 from s0undt3ch/issues/8447-timeout-from-configfile-not-respected
...
Update the parser options with values from config file. Fixes #8447 .
2013-12-05 23:05:03 -08:00
Thomas S Hatch
edb4f9d995
Merge pull request #9015 from cowyn/develop
...
Added exception handler for git repo init
2013-12-05 23:04:02 -08:00
David Boucha
20ebfe3521
Merge pull request #9041 from thematthopkins/windows_install_flags
...
Support to appending node specific extra_install_flags to windows packag...
2013-12-05 17:03:23 -08:00
David Boucha
3a34b64d20
Merge pull request #9022 from thematthopkins/develop
...
switches paths to state files to use forwardslashes on masterless window...
2013-12-05 17:02:07 -08:00
David Boucha
e3aa0b8103
Merge pull request #9064 from UtahDave/develop
...
add a space to satisfy pylint
2013-12-05 16:57:02 -08:00
David Boucha
bea7bc01d5
add a space to satisfy pylint
2013-12-05 17:56:14 -07:00
Thomas S Hatch
01387050f5
Merge pull request #9063 from cachedout/#6764
...
Wrap highstate.cache.p in restrictive umask.
2013-12-05 16:33:58 -08:00
Mike Place
7404f15af9
Wrap highstate.cache.p in restrictive umask.
2013-12-05 17:21:44 -07:00
David Boucha
0f806796bc
Merge pull request #9062 from UtahDave/develop
...
namespace file_exists in win_file.py
2013-12-05 15:50:27 -08:00
David Boucha
06d8f7fc7f
namespace file_exists
2013-12-05 16:48:51 -07:00
Thomas S Hatch
6cd183b690
Merge pull request #9020 from ouiea/fix-gem-rvm-with-another-user
...
Fixes issue #8951 - gem install fails when rvm is set up with another us...
2013-12-05 13:51:01 -08:00
Pedro Algarvio
b5513395f3
Don't rely on salt.utils.is_windows(), it fails at install time under windows.
2013-12-05 20:54:33 +00:00
Pedro Algarvio
9226f98bfe
Let's include Salt Cloud to avoid circular import issues in Windows.
2013-12-05 20:46:35 +00:00
Thomas S Hatch
d135dc0239
Merge pull request #9019 from blackduckx/develop
...
Support Oracle Linux 5.x
2013-12-05 12:05:50 -08:00
pyinx
7c20dd12b2
add saltstack state: memcached
2013-12-05 12:44:07 -07:00
pyinx
8e4345266a
add saltstack module: memcached
2013-12-05 12:44:00 -07:00
