Commit Graph

22757 Commits

Author SHA1 Message Date
Joseph Hall
be35c75ec9 Make sure that tmp_dir is owned by sudo user 2013-11-20 20:50:25 -07:00
Joseph Hall
228e46c794 Fixing up tmp_dir and event_kwargs 2013-11-20 20:25:12 -07:00
Pedro Algarvio
ba3bd5f6e6 Merge pull request #8697 from s0undt3ch/hotfix/jenkins
PyLint's `disable-msg` is deprecated. Use `disable`.
2013-11-20 11:43:57 -08:00
Pedro Algarvio
7f1e6ceb50 PyLint's disable-msg is deprecated. Use disable. 2013-11-20 19:42:49 +00:00
Pedro Algarvio
b281866090 Merge pull request #8696 from s0undt3ch/hotfix/jenkins
Remove duplicate key and update the default value.
2013-11-20 11:40:43 -08:00
Pedro Algarvio
74c8011bd0 Remove duplicate key and update the default value. 2013-11-20 19:39:49 +00:00
Pedro Algarvio
f10201c848 Merge pull request #8695 from s0undt3ch/hotfix/jenkins
Fix `NameError`'s and backslash.
2013-11-20 11:31:32 -08:00
Pedro Algarvio
447217f009 Fix NameError's and backslash. 2013-11-20 19:30:28 +00:00
Pedro Algarvio
cdaac37010 Merge pull request #8687 from techhat/sanitize
Further sanitize data fired in an event
2013-11-20 11:00:18 -08:00
Pedro Algarvio
9ca9bb447f Merge pull request #8694 from techhat/sudofix
The sudo_password is actually found in kwargs
2013-11-20 10:58:53 -08:00
Joseph Hall
573753386c The sudo_password is actually found in kwargs 2013-11-20 11:57:47 -07:00
Pedro Algarvio
3ffeb256ee Merge pull request #8693 from techhat/cloudtmpdir
Allow tmp_dir to be user-configurable
2013-11-20 10:44:33 -08:00
Joseph Hall
9d64eadbca Actually _allow_ users to define tmp_dir 2013-11-20 11:37:02 -07:00
Joseph Hall
bba9ad7551 Allow tmp_dir to be user-configurable 2013-11-20 11:23:15 -07:00
Colton Myers
3dd63bcebb Merge pull request #8688 from techhat/fixsshuser
Fixing syntax errors with the ssh_user
2013-11-20 10:08:34 -08:00
Joseph Hall
df4fd98953 Fixing syntax errors with the ssh_user 2013-11-20 11:06:46 -07:00
Joseph Hall
40c3c4185c Further sanitize data fired in an event 2013-11-20 10:00:14 -07:00
Thomas S Hatch
2a1e9cdcb9 Merge pull request #8652 from s0undt3ch/hotfix/deploy_scripts_search_path-fixes-only
Hotfix/deploy scripts search path fixes only
2013-11-20 08:36:27 -08:00
Thomas S Hatch
f21fe5eae6 Merge pull request #8669 from techhat/saltify
Allow ssh_username and sudo options to be user-configurable
2013-11-20 08:35:09 -08:00
Joseph Hall
1da7ec9dea Merge pull request #8683 from techhat/cloudconfs
Fixing up salt-cloud sample configs
2013-11-20 08:04:37 -08:00
Joseph Hall
21a29a4bec Fixing up cloud.profiles with more valid configs 2013-11-20 08:51:51 -07:00
Joseph Hall
827ba113ef Fixing up salt-cloud sample configs 2013-11-20 08:48:01 -07:00
Joseph Hall
98cda60faa Allow sudo_password to be user-configurable 2013-11-20 07:53:16 -07:00
Pedro Algarvio
265d51c691 Merge pull request #8656 from cvrebert/patch-1
make gnomedesktop._GSettings a new-style class
2013-11-20 04:05:22 -08: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
1900e3afe3 make gnomedesktop._GSettings a new-style class 2013-11-19 17:10:20 -08:00
Chris Rebert
e692442fe3 use modern 'except FooErr as bar:' syntax 2013-11-19 16:51:23 -08:00
Pedro Algarvio
19ffee67b1 Fix the order in which the configuration is updated. 2013-11-19 23:25:51 +00:00
Pedro Algarvio
82e25f03a2 Handle the deprecated libcloud attributes. 2013-11-19 23:22:50 +00:00
Pedro Algarvio
e64aa47daa Make show_instance global before name spacing it. 2013-11-19 23:22:37 +00:00
Pedro Algarvio
7d3967ff8d Revert "Provide a default conf_dir to look in for cloud.deploy.d"
This reverts commit 8f043ec841.
2013-11-19 23:22:24 +00: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