Commit Graph

47266 Commits

Author SHA1 Message Date
Thomas Jackson
98af7c3f95 Cleanup jinja attribute access for loader
Refactor of #22723
2015-04-21 22:39:17 -07:00
Justin Findlay
4db13ee454 Merge pull request #22924 from rallytime/bp-22829
Backport #22829 to 2015.2
2015-04-21 20:29:56 -06:00
Justin Findlay
049276af44 Merge pull request #22921 from s0undt3ch/hotfix/lint-2015.2
Another PEP-8 preciosity disabled
2015-04-21 20:28:42 -06:00
Justin Findlay
53001566e0 Merge pull request #22882 from freimer/issue_22880
Fix for issue #22880, this should be **kwarg, not kwarg=None.
2015-04-21 20:28:03 -06:00
Felix Dreissig
468d392074 Adjust tests to the new return value of modules.localemod.gen_locale() 2015-04-21 19:11:33 -06:00
Felix Dreissig
16136f49ec Always return a boolean in modules.localemod.gen_locale()
This makes the behavior consistent with set_locale() and the error case.
states.locale.present() already expects a boolean return value;
therefore, this will probably resolve saltstack/salt#21140.
2015-04-21 19:10:43 -06:00
Nicole Thomas
522d1d8468 Merge pull request #22917 from twangboy/upd_icon
Updated icon file for windows
2015-04-21 18:56:47 -06:00
Nicole Thomas
2793ad667b Merge pull request #22911 from rallytime/test_fixes
Fix some Python 2.6-related test failures on 2015.2
2015-04-21 18:44:37 -06:00
Pedro Algarvio
430c5cfdf7 Another PEP-8 preciosity disabled 2015-04-22 00:46:20 +01:00
salt_build
7cbabd0cf9 Updated icon file for windows 2015-04-21 22:33:59 +00:00
rallytime
cac386247c Skip the network state unit tests if sustem is on Python 2.6
These tests need to be refactored to be able to run on Python 2.6
2015-04-21 14:13:58 -06:00
Fred Reimer
7958e19e9a Merge remote-tracking branch 'upstream/2015.2' into issue_22880 2015-04-21 15:03:41 -04:00
Thomas S Hatch
022a43aaa9 Merge pull request #22904 from jacobhammons/2015.2
Regenerated man pages
2015-04-21 12:51:48 -06:00
Thomas S Hatch
e636a31bfd Merge pull request #22855 from jacksontj/2015.2
Add failhard option to salt batching
2015-04-21 12:51:24 -06:00
rallytime
1be53aaf7d Remove Python 2.6 incompatible section of test
A portion of this test seems to be only testing the differences
between the way Python is using the help string between 2.6 and
2.7. This section doesn't really seem to be testing any salt code.
2015-04-21 12:25:31 -06:00
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
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
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
rallytime
3ce1cef592 Fix Python 2.6 syntax error in unit.modules.state_test.py 2015-04-21 11:01:33 -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
Nicole Thomas
f7ccbac1f2 Merge pull request #22884 from jfindlay/merge_22847
Merge 22847
2015-04-21 10:15: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
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