Commit Graph

34881 Commits

Author SHA1 Message Date
Mike Place
5f7a9d98ec Randomize salt cloud deployment directory
Conflicts:
	salt/utils/cloud.py
2014-07-29 10:51:49 -06:00
Nitin Madhok
4f9349381e Fixing a broken link and formatting code block 2014-07-29 12:03:49 -04:00
Colton Myers
f0b74800c2 Merge branch '2014.7' into develop 2014-07-29 09:56:15 -06:00
Mike Place
f503e98f0f Merge pull request #14599 from cachedout/rpm_redir_2014_7
Avoid redirects for RHEL5 RPMs to workaround a bug in RPM
2014-07-29 09:54:43 -06:00
David Boucha
98daa32406 Merge pull request #14597 from zigarn/issue/14596
Fix `disk.usage` units on Windows
2014-07-29 09:53:08 -06:00
Mike Place
2951d1b72e Avoid redirects for RHEL5 RPMs to workaround a bug in RPM
Conflicts:
	salt/cloud/deploy/bootstrap-salt.sh
2014-07-29 09:53:01 -06:00
Erik Johnson
9a75afffb6 Merge branch 'bp-14594' into develop 2014-07-29 10:36:56 -05:00
Erik Johnson
36333e4d49 Merge branch 'bp-14594' into 2014.7 2014-07-29 10:36:30 -05:00
Egor Potiomkin
852571056e prevent gitfs.py changing load variable that is used by other fs modules too 2014-07-29 10:35:42 -05:00
Erik Johnson
56ff80bdb8 Merge pull request #14594 from sivir/develop
prevent gitfs.py from changing load variable
2014-07-29 10:30:14 -05:00
C. R. Oldham
ee748f3074 Forward merge 2014.7 2014-07-29 09:23:43 -06:00
C. R. Oldham
fe5ba8874e Merge pull request #14570 from gtmanfred/2014.7
close pylint errors
2014-07-29 09:18:18 -06:00
Alexandre Garnier
b6f533e416 Fix disk.usage units on Windows
Convert `win32api.GetDiskFreeSpace` Bytes output into 1K-block.
2014-07-29 17:17:12 +02:00
Mike Place
c3c8dc7a4c Merge pull request #14551 from s0undt3ch/2014.7
Update to latest, v2014.07.27 bootstrap script.
2014-07-29 09:16:23 -06:00
C. R. Oldham
46bd04d461 Merge pull request #14569 from cvrebert/patch-1
fix gramar & typo in states.archive.extracted
2014-07-29 09:12:14 -06:00
C. R. Oldham
dfff95656a Merge pull request #14547 from makinacorpus/fix3
aptpkg: restore support for lenny...
2014-07-29 08:43:46 -06:00
Pedro Algarvio
e101a8453d Update to latest, v2014.07.29 bootstrap script.
* Shallow clone Salt's repository for speed improvements. In case of failure, resume old behaviour.
* Fixed bug introduced in 0577622 when salt-api service install and checks were added
* Distro Support Fixed:
  * Fixed infinite loop when handling RHEL dependencies. Thanks Dan Mick(@dmick).
2014-07-29 13:23:38 +01:00
Egor Potiomkin
c0a5ccbce1 prevent gitfs.py changing load variable that is used by other fs modules too 2014-07-29 18:45:24 +09:00
Joseph Hall
c154010ca8 Merge pull request #14592 from mickep76/fix-unnecessary-shadowing
Fix unnecessary shadowing pylint error #14529
2014-07-29 01:18:01 -06:00
Michael Persson
96040d6bb3 Fix unnecessary shadowing pylint error #14529 2014-07-29 09:15:10 +02:00
Joseph Hall
56ac0ebfa8 Merge pull request #14562 from hulu/tls-str-format-cleanup
cleanup string formatting in modules.tls.create_ca()
2014-07-29 00:11:32 -06:00
Joseph Hall
1e625c7348 Merge pull request #14578 from talwai/patch-1
Fix typo in Load filters docstring
2014-07-29 00:09:02 -06:00
Joseph Hall
d701904227 Merge pull request #14579 from hulu/str-format-fixes
Various simple string formatting fixes
2014-07-29 00:08:26 -06:00
Joseph Hall
fe8d665dce Merge pull request #14581 from cvrebert/patch-2
modules.nftables.new_chain(): fix typos in comment
2014-07-29 00:06:55 -06:00
Joseph Hall
59ae19d4cc Merge pull request #14589 from hulu/str-format-fixes-deux
More string formatting fixes
2014-07-29 00:05:55 -06:00
Joseph Hall
e7578a3051 Merge pull request #14583 from johnnoone/ec2-format
[CLOUD:ec2] attach volumes before provisionning
2014-07-29 00:01:43 -06:00
Daniel Wallace
d844fdedaf closes #14586 2014-07-28 20:42:56 -05:00
Daniel Wallace
88792c67bd closes #14587 2014-07-28 20:41:21 -05:00
Daniel Wallace
44401243b0 closes #14588 2014-07-28 20:39:03 -05:00
Daniel Wallace
8f2960a8f6 closes #14585 2014-07-28 20:36:45 -05:00
Chris Rebert
bdcfc3205d modules.boto_iam: fix bad str formatting so role gets logged properly
************* Module salt.modules.boto_iam
salt/modules/boto_iam.py:259: [E1305(too-many-format-args), associate_profile_to_role] Too many arguments for format string
salt/modules/boto_iam.py:264: [E1305(too-many-format-args), associate_profile_to_role] Too many arguments for format string
salt/modules/boto_iam.py:297: [E1305(too-many-format-args), disassociate_profile_from_role] Too many arguments for format string
salt/modules/boto_iam.py:302: [E1305(too-many-format-args), disassociate_profile_from_role] Too many arguments for format string
2014-07-28 18:34:00 -07:00
Chris Rebert
79937f066e cloud.clouds.gce.__virtual__(): fix bad str formatting in err msgs
************* Module salt.cloud.clouds.gce
salt/cloud/clouds/gce.py:190: [E1305(too-many-format-args), __virtual__] Too many arguments for format string
salt/cloud/clouds/gce.py:200: [E1305(too-many-format-args), __virtual__] Too many arguments for format string
2014-07-28 18:30:40 -07:00
Daniel Wallace
e3b9cda6cb closes #14582 2014-07-28 19:52:01 -05:00
Chris Rebert
39d7cab753 modules.influx: fix bad str formatting so DB is included in log messages
************* Module salt.modules.influx
salt/modules/influx.py:288: [E1305(too-many-format-args), user_create] Too many arguments for format string
salt/modules/influx.py:330: [E1305(too-many-format-args), user_chpass] Too many arguments for format string
salt/modules/influx.py:372: [E1305(too-many-format-args), user_remove] Too many arguments for format string
2014-07-28 17:51:26 -07:00
Chris Rebert
9cbaa25137 modules.nftables.new_chain(): fix typos in comment 2014-07-28 17:42:51 -07:00
Xavier Barbosa
3161029ccd [CLOUD:ec2] attach volumes before provisionning (in order to prepare volumes, like formating... before salt-minion install) 2014-07-29 02:42:30 +02:00
Chris Rebert
c062a35ad5 modules.nftables: fix str formatting to include 'family' in err msgs properly
************* Module salt.modules.nftables
salt/modules/nftables.py:367: [E1305(too-many-format-args), get_rule_handle] Too many arguments for format string
salt/modules/nftables.py:419: [E1305(too-many-format-args), check] Too many arguments for format string
salt/modules/nftables.py:593: [E1305(too-many-format-args), new_chain] Too many arguments for format string
salt/modules/nftables.py:643: [E1305(too-many-format-args), delete_chain] Too many arguments for format string
salt/modules/nftables.py:687: [E1305(too-many-format-args), append] Too many arguments for format string
salt/modules/nftables.py:744: [E1305(too-many-format-args), insert] Too many arguments for format string
salt/modules/nftables.py:801: [E1305(too-many-format-args), delete] Too many arguments for format string
salt/modules/nftables.py:848: [E1305(too-many-format-args), flush] Too many arguments for format string
2014-07-28 17:39:33 -07:00
Chris Rebert
9af0fe19d5 utils.cloud.wait_for_passwd(): fix bad string formatting in debug logging
************* Module salt.utils.cloud
salt/utils/cloud.py:727: [E1305(too-many-format-args), wait_for_passwd] Too many arguments for format string
2014-07-28 17:34:40 -07:00
Chris Rebert
c537d7d02b fix bad string formatting in states.nftables comment messages
************* Module salt.states.nftables
salt/states/nftables.py:415: [E1306(too-few-format-args), delete] Not enough arguments for format string
salt/states/nftables.py:462: [E1306(too-few-format-args), flush] Not enough arguments for format string
2014-07-28 17:33:14 -07:00
Daniel Wallace
d1f767be4f closes #14580 2014-07-28 19:32:33 -05:00
Daniel Wallace
855fd9f054 closes #14563
need to escape the {} for the format dictionary
2014-07-28 19:30:35 -05:00
Chris Rebert
ffb192e5e9 fix bad string formatting in states.win_update
************* Module salt.states.win_update
salt/states/win_update.py:430: [E1305(too-many-format-args), installed] Too many arguments for format string
salt/states/win_update.py:502: [E1305(too-many-format-args), downloaded] Too many arguments for format string
2014-07-28 17:25:46 -07:00
Pedro Algarvio
4773ef18db Merge pull request #14572 from hulu/iptables-str-fmt-fixes
cleanup string formatting in modules.iptables
2014-07-29 01:25:29 +01:00
Pedro Algarvio
8c48902f36 Merge pull request #14574 from hulu/dockerio-str-fmt
states.dockerio.running(): fix string formatting in error message
2014-07-29 01:24:46 +01:00
Pedro Algarvio
ce0fcabbb1 Merge pull request #14567 from hulu/cmdmod-str-fmt
cleanup string formatting in modules.cmdmod
2014-07-29 01:24:01 +01:00
Chris Rebert
7cb4415526 states.rabbitmq_policy.present: fix bad string formatting in comment message
************* Module salt.states.rabbitmq_policy
salt/states/rabbitmq_policy.py:83: [E1305(too-many-format-args), present] Too many arguments for format string
2014-07-28 17:18:13 -07:00
Aaditya Talwai
60e07b95b2 Fix typo in Load filters docstring 2014-07-28 17:15:18 -07:00
Daniel Wallace
34ac8a91bc closes #14573 2014-07-28 19:08:55 -05:00
Daniel Wallace
133252a10e closes #14571 2014-07-28 19:08:28 -05:00
Daniel Wallace
1bba39f500 closes #14576 2014-07-28 19:06:40 -05:00