Commit Graph

22729 Commits

Author SHA1 Message Date
Joseph Hall
98cda60faa Allow sudo_password to be user-configurable 2013-11-20 07:53:16 -07:00
Joseph Hall
10482f4da2 Allow ssh_username, sudo and tty to be set manually from provider/profile configs 2013-11-19 21:09:00 -07:00
Joseph Hall
b947b71647 Merge pull request #8666 from cvrebert/patch-7
s3fs: fix typo in comment
2013-11-19 20:01:15 -08:00
Joseph Hall
1943ec0a49 Merge pull request #8663 from cvrebert/patch-5
client.ssh.state.SSHState.load_modules: avoid shadowing locals() built-in
2013-11-19 20:00:54 -08:00
Joseph Hall
b0a1a4a669 Merge pull request #8665 from hulu/nova
streamline nova.server_show() & avoid shadowing server_list()
2013-11-19 19:59:51 -08:00
Joseph Hall
516730cceb Merge pull request #8662 from hulu/dont-shadow-set-type
use aliases to avoid shadowing built-in set type
2013-11-19 19:58:45 -08:00
Joseph Hall
f697f01eb5 Merge pull request #8661 from cvrebert/patch-4
modules.aws_sqs: rm unused import
2013-11-19 19:58:22 -08:00
Joseph Hall
6c7f310412 Merge pull request #8660 from cvrebert/patch-2
salt.log.setup: rm unused import
2013-11-19 19:58:03 -08:00
Joseph Hall
c6458a5b5d Merge pull request #8659 from cvrebert/patch-3
libcloud_aws: rm unused import
2013-11-19 19:57:43 -08:00
Joseph Hall
589051a924 Merge pull request #8655 from hulu/use-except-as
use modern 'except FooErr as bar:' syntax
2013-11-19 19:53:57 -08:00
Chris Rebert
abf9a77ff3 s3fs: fix typo in comment 2013-11-19 18:00:43 -08:00
Chris Rebert
ac36665d38 streamline nova.server_show() & avoid shadowing server_list() 2013-11-19 17:51:59 -08:00
Chris Rebert
599d4ddd0c client.ssh.state.SSHState.load_modules: avoid shadowing locals() built-in 2013-11-19 17:39:02 -08:00
Chris Rebert
5abc3d8bec use aliases to avoid shadowing built-in set type 2013-11-19 17:34:54 -08:00
Chris Rebert
edad0cbcbc modules.aws_sqs: rm unused import
salt/modules/aws_sqs.py:9: [W0611(unused-import), ] Unused import CommandExecutionError
2013-11-19 17:28:52 -08:00
Chris Rebert
619a917891 salt.log.setup: rm unused import
salt/log/setup.py:36: [W0611(unused-import), ] Unused import string_types
2013-11-19 17:27:44 -08:00
Chris Rebert
a0963b4313 libcloud_aws: rm unused import
salt/cloud/clouds/libcloud_aws.py:50: [W0611(unused-import), ] Unused import copy
2013-11-19 17:18:08 -08:00
Pedro Algarvio
38a229503c Merge pull request #8657 from cvrebert/patch-2
map -> map_, to avoid shadowing built-in map() func
2013-11-19 17:14:51 -08:00
Chris Rebert
b0c635a0f5 map -> map_, to avoid shadowing built-in map() func 2013-11-19 17:13:34 -08:00
Chris Rebert
e692442fe3 use modern 'except FooErr as bar:' syntax 2013-11-19 16:51:23 -08:00
C. R. Oldham
813641f57f Merge pull request #8650 from cro/pylint_19nov
Pylint fixes.
2013-11-19 14:44:49 -08:00
C. R. Oldham
6f222c81d5 Pylint fixes. 2013-11-19 15:43:56 -07:00
Thomas S Hatch
64213a712a Fix #8642 2013-11-19 14:05:12 -07:00
C. R. Oldham
6dd31c3831 Merge pull request #8644 from cro/change_jid_include_default
Change the default for jid_include for the scheduler to True
2013-11-19 12:03:58 -08:00
C. R. Oldham
c02dfabc1e Change the default for jid_include for the scheduler to True 2013-11-19 13:02:47 -07:00
Thomas S Hatch
6f617d8661 Merge pull request #8641 from cachedout/#8590
Wrap new file creation in file.managed in more restrictive umask.
2013-11-19 12:02:22 -08:00
Thomas S Hatch
cd034f8b0f Merge pull request #8629 from william20111/develop
SUSE bug 8428 fix
2013-11-19 11:59:07 -08:00
Thomas S Hatch
514a6f91e8 Merge pull request #8624 from garethgreenaway/develop
Adding IPv6 configuration items to rh_ip.py
2013-11-19 11:58:13 -08:00
Thomas S Hatch
faa24eeafc Merge pull request #8623 from malinoff/drop-string-module
Replaced string lib usage with str methods
2013-11-19 11:57:44 -08:00
Seth House
efb0ec62bd Updated saltify docs with cross-reference to core config docs 2013-11-19 11:10:33 -08:00
Seth House
e8bc71abe6 Added rST reference to Saltify core config docs 2013-11-19 11:10:32 -08:00
Colton Myers
c6e2b26e66 Merge pull request #8621 from gravyboat/develop
Updated troubleshooting doc with details regarding 0.16 and 0.17 compatibility.
2013-11-19 11:04:14 -08:00
Thomas S Hatch
a2137ef18d Merge pull request #8607 from s0undt3ch/issues/2399-env-config-dir
Support SALT_CONFIG_DIR
2013-11-19 10:59:24 -08:00
Thomas S Hatch
9a03c14687 Merge pull request #8578 from heewa/verify_pillar_from_master
Verify pillar from master on minion.
2013-11-19 10:57:27 -08:00
Mike Place
d296ebe7c0 Wrap file creation in file.managed in more restrictive umask. 2013-11-19 11:00:09 -07:00
Joseph Hall
5a575e0364 Merge pull request #8638 from sylvestre/develop
Improve the documentation
2013-11-19 08:25:01 -08:00
Sylvestre Ledru
0d5afed1a8 Debian is not necessary a Linux. It can also be a Freebsd or HURD based 2013-11-19 17:23:56 +01:00
Sylvestre Ledru
03f14de476 Fix more typos in the documentation 2013-11-19 17:22:56 +01:00
Joseph Hall
c4d98a43da Merge pull request #8636 from sylvestre/develop
Fix some minor typos
2013-11-19 08:07:47 -08:00
Sylvestre Ledru
b9a04bcc68 Consistency change in the documentation 2013-11-19 17:03:28 +01:00
Sylvestre Ledru
49de8e0aa9 Fix some minor typos 2013-11-19 16:57:51 +01:00
David Boucha
dc2c5059c7 Merge pull request #8630 from UtahDave/develop
Actually allow joining a domain
2013-11-19 04:07:18 -08:00
David Boucha
c137bcc45d Actually allow joining a domain 2013-11-19 05:02:18 -07:00
William Fleming
c31d89c06c SUSE bug 8428 fix (update)
c&p fix
2013-11-19 11:36:12 +00:00
Pedro Algarvio
d54ce3a8a2 Merge pull request #8627 from holmboe/patch-1
Copy edit cloud controller doc
2013-11-19 03:19:37 -08:00
William Fleming
9654e3a626 SUSE bug 8428 fix
Created a workaround till SUSE fix their lsb bug. Now gives the patch version in osrelease
2013-11-19 11:06:52 +00:00
David Boucha
bbea27f6ad Merge pull request #8628 from UtahDave/develop
Fix several edge cases where dhcp and static ip and dns settings weren't handled correctly on Windows.
2013-11-19 02:52:41 -08:00
David Boucha
351ae08d3b Handle setting static ip same as current dhcp ip 2013-11-19 03:44:20 -07:00
David Boucha
52911ff6ec only set gateway and ip if statically set 2013-11-19 03:09:21 -07:00
Henrik Holmboe
3a57bc00ee Copy edit cloud controller doc 2013-11-19 10:48:00 +01:00