Commit Graph

47362 Commits

Author SHA1 Message Date
Justin Findlay
13698f2a7e Merge pull request #22899 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-21 12:01:31 -06:00
Jacob Hammons
99abfd7755 Regenerated man pages 2015-04-21 11:33:30 -06:00
Thomas S Hatch
e2ec4ecc55 Merge pull request #22897 from rallytime/fix-22825
Add param documentation for file.replace state
2015-04-21 11:31:04 -06:00
Jacob Hammons
32ef5ca397 Revert "Regenerated man pages"
This reverts commit 069a0cac71.
2015-04-21 11:27:31 -06:00
Jacob Hammons
069a0cac71 Regenerated man pages 2015-04-21 11:20:52 -06:00
rallytime
8f703461b0 Change state example to use proper kwarg
docker.run takes cid as a kwarg, not container
2015-04-21 11:16:05 -06:00
Thomas S Hatch
629f9e02ac Merge pull request #22883 from jfindlay/fix_syndic_cache_path
make parent dir(s) before creating syndic cache file
2015-04-21 11:07:17 -06:00
Thomas S Hatch
fd53889f0e Merge pull request #22850 from bersace/fix-pillar-salt-mixed
Fix pillar and salt fileserver mixed
2015-04-21 11:04:33 -06:00
rallytime
3ce1cef592 Fix Python 2.6 syntax error in unit.modules.state_test.py 2015-04-21 11:01:33 -06:00
Justin Findlay
ba4a786984 add route53 record sync wait, default=False 2015-04-21 10:38:30 -06:00
Colton Myers
92c51affc5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-21 10:33:39 -06:00
Erik Johnson
c375309434 dockerio: better error message for native exec driver
This provides a more useful error message when using the native
execution driver and nsenter is not available.
2015-04-21 11:23:24 -05:00
Nicole Thomas
f7ccbac1f2 Merge pull request #22884 from jfindlay/merge_22847
Merge 22847
2015-04-21 10:15:31 -06:00
rallytime
9c51630002 Add param documentation for file.replace state
Fixes #22825
2015-04-21 09:47:31 -06:00
Justin Findlay
8b2e60127d Merge pull request #22893 from s0undt3ch/hotfix/lint-2015.2
[2015.2] Lint Fixes
2015-04-21 09:24:49 -06:00
Justin Findlay
c2a5d59fb7 Merge pull request #22890 from jayeshka/postfix-unit-test
adding postfix unit test case
2015-04-21 09:01:18 -06:00
Justin Findlay
3640fa59bc Merge pull request #22889 from jayeshka/blockdev-states-unit-test
adding states/blockdev unit test case
2015-04-21 08:48:06 -06:00
Justin Findlay
910af016ab Merge pull request #22888 from jayeshka/aws_sqs-states-unit-test
adding states/aws_sqs unit test case
2015-04-21 08:47:03 -06:00
Justin Findlay
7899914dbe fix deprecated artifactory state code 2015-04-21 08:38:23 -06:00
Pedro Algarvio
62ae9e061a Forgot to add the code 2015-04-21 15:08:42 +01:00
Pedro Algarvio
3ae68c4f7b Minor cosmetic changes in order not to disable the PEP8 PyLint code all together 2015-04-21 15:03:47 +01:00
Pedro Algarvio
8565e9fe1c Ignore no name in module for distutils.version 2015-04-21 14:53:21 +01:00
Joseph Hall
ce58de87b2 Merge pull request #22885 from dmuntean/fix-aws-plus-sign-encoding
Encode spaces with %20 instead of plus sign in AWS request query strings
2015-04-21 07:52:54 -06:00
Pedro Algarvio
4002d90e19 Disable W1307 (invalid-format-index)
Using invalid lookup key '%s' in format specifier "0['%s']"
2015-04-21 14:51:54 +01:00
Florian Ermisch
58fa24c7fa Clarify doc on kwarg 'roles' for user_present().
Previously passing the roles in single-key-dicts
worked so the changed behavior should be reflected
in a updated docstring.
2015-04-21 15:50:52 +02:00
Florian Ermisch
f0ae2eb84f Improve readability by renaming tenant_role
The for-loop processing the kwarg roles only
iterates over tenant *names* so naming the
variable "tenant_role" is misleading.

Also explicitly iterating over the passed dict's
keys so we get a useful error message when a list
is passed instead (and makes the code easier to
read).
2015-04-21 15:32:15 +02:00
Fred Reimer
5ac5426e46 Revert changes to mixins cmd, as the better place to fix this is where it is called. 2015-04-21 09:03:27 -04:00
Pedro Algarvio
ae2bca1f6f Fix W1504(unidiomatic-typecheck 2015-04-21 14:02:17 +01:00
Pedro Algarvio
7f1954bea9 Fix False comparison 2015-04-21 14:00:46 +01:00
Pedro Algarvio
3dc9b0129b Fix comparison to None 2015-04-21 14:00:00 +01:00
Pedro Algarvio
a37502f0f6 Remove bad PyLint options 2015-04-21 13:54:21 +01:00
Pedro Algarvio
3d058759dc Ignore no name in module for distutils.version 2015-04-21 13:52:13 +01:00
Pedro Algarvio
8a0e042787 Fix PyLint W1504(unidiomatic-typecheck) Using type() instead of isinstance() for a typecheck. 2015-04-21 13:49:45 +01:00
Chris Rebert
cb50a7dcc3 use isinstance() instead of type() for typechecks
************* Module salt.modules.mdadm
/Users/chris/code/salt/salt/modules/mdadm.py:340: [W1504(unidiomatic-typecheck), assemble] Using type() instead of isinstance() for a typecheck.
************* Module salt.states.pip_state
/Users/chris/code/salt/salt/states/pip_state.py:476: [W1504(unidiomatic-typecheck), installed.<lambda>] Using type() instead of isinstance() for a typecheck.
************* Module salt.states.pkg
/Users/chris/code/salt/salt/states/pkg.py:227: [W1504(unidiomatic-typecheck), _find_install_targets] Using type() instead of isinstance() for a typecheck.
************* Module salt.pillar.pepa
/Users/chris/code/salt/salt/pillar/pepa.py:462: [W1504(unidiomatic-typecheck), ext_pillar] Using type() instead of isinstance() for a typecheck.
/Users/chris/code/salt/salt/pillar/pepa.py:464: [W1504(unidiomatic-typecheck), ext_pillar] Using type() instead of isinstance() for a typecheck.
2015-04-21 13:49:15 +01:00
Fred Reimer
365c7ffcb8 Remove wait for minion start, I think this happens before, so we will never proceed. 2015-04-21 08:48:46 -04:00
Chris Rebert
03ae55c284 use is instead of == for class equality checks
************* Module salt.pillar.pepa
/Users/chris/code/salt/salt/pillar/pepa.py:460: [W1504(unidiomatic-typecheck), ext_pillar] Using type() instead of isinstance() for a typecheck.
************* Module salt.utils.process
/Users/chris/code/salt/salt/utils/process.py:225: [W1504(unidiomatic-typecheck), ProcessManager.add_process] Using type() instead of isinstance() for a typecheck.
2015-04-21 13:45:35 +01:00
Jayesh Kariya
2cfd1a4395 adding postfix unit test case 2015-04-21 17:36:07 +05:30
Jayesh Kariya
4aac4904b4 adding states/blockdev unit test case 2015-04-21 17:32:30 +05:30
Jayesh Kariya
7674fee99f adding states/aws_sqs unit test case 2015-04-21 17:30:48 +05:30
Dmitri Muntean
19f5d7e4e9 Remove duplicate and unused code in aws utils package
The code for canonical request and payload hash generation is duplicate.
timestamp is not used at all.
2015-04-21 15:46:15 +10:00
Dmitri Muntean
5a14389839 Encode spaces with %20 instead of plus sign in AWS request query strings
It is currently not possible to set tag values (or any other values in AWS query string)
to strings that contain spaces.

urlencode function from urllib replaces spaces with '+' (plus sign) to produce
application/x-www-form-urlencoded format, but AWS signing process document
explicitly talks about encoding spaces with %20 rather than '+' (see
http://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html)

There is an exiting issue raised in python bug tracker to have an ability to modify
this behaivour of urlencode (see https://bugs.python.org/issue13866). But until
it is resolved, this looks like the best way to go.
2015-04-21 15:33:49 +10:00
Justin Findlay
1380fec1b9 Merge pull request #22818 from twangboy/upd_pip_docs
Added documentation regarding pip in windows
2015-04-20 21:58:59 -06:00
Justin Findlay
7fe3efa0f9 Merge pull request #22848 from jayeshka/apache-states-unit-test
adding states/apache unit test case
2015-04-20 21:44:42 -06:00
Justin Findlay
15e869d540 Merge pull request #22849 from jayeshka/apt-states-unit-test
adding states/apt unit test case
2015-04-20 21:44:15 -06:00
Justin Findlay
65de2b73a8 make parent dir(s) before creating syndic cache file 2015-04-20 21:40:48 -06:00
Fred Reimer
ffc2683e81 Fix for issue 22880, this should be **kwargs, not kwargs=None.
Without this fix, and kwargs passed results in a TypeError
2015-04-20 23:38:01 -04:00
Justin Findlay
42761ee346 Merge pull request #22846 from jayeshka/at-states-unit-test
adding states/at unit test case
2015-04-20 21:33:28 -06:00
Justin Findlay
be16c24b0b Merge pull request #22845 from jayeshka/augeas-states-unit-test
adding states/augeas unit test case
2015-04-20 21:25:55 -06:00
Justin Findlay
b2bf17f5d5 Merge pull request #22872 from rallytime/fix_hosts_stacktrace
Prevent stacktrace on os.path.exists in hosts module
2015-04-20 20:54:39 -06:00
Justin Findlay
0babdb90c7 Merge pull request #22871 from thatch45/py3cql
py3 compat for cassanra_cql
2015-04-20 20:53:37 -06:00