Commit Graph

18721 Commits

Author SHA1 Message Date
Pedro Algarvio
c5082f2a77 Patch salt.utils.which to fix Django tests.
After the check added in 8deefc16, the django salt module integration test cases started to fail if the django administration script was not found in `$PATH`.
2013-10-04 19:07:11 +01:00
Mike Place
766b3f405d The documentation for 'Developing Salt' is missing a critical step for 0.17+ users who wish to utilize the test runner. This commit describes the direct installation of salt-testing.
Forthcoming will be a re-write what appears to be a new method for establishing a development environment through the use of dev_requirements_python2(6|7).txt, once I have a chance to verify
that the workflow is as expected.
2013-10-04 12:06:43 -06:00
Joseph Hall
1b7601c18d Merge pull request #7619 from s0undt3ch/hotfix/lint
PEP-8 E302
2013-10-04 10:57:48 -07:00
Pedro Algarvio
002d685000 Fix PEP-8 E302 2013-10-04 18:56:23 +01:00
Pedro Algarvio
e104d4249f Fix PEP-8 E302 2013-10-04 18:56:07 +01:00
Thomas S Hatch
cc939ec5c7 Merge pull request #7618 from s0undt3ch/hotfix/lint
The `pep8` lint library is not that great.
2013-10-04 10:55:01 -07:00
Pedro Algarvio
93f2c7cd2d The pep8 lint library is not that great. 2013-10-04 18:53:27 +01:00
Thomas S Hatch
8be0ccd401 Merge pull request #7617 from ajithhub/remove_nic_classes
Delete the Nic classes from my previous implemntation
2013-10-04 10:24:49 -07:00
Erik Johnson
90ad004ffc Remove unneeded reference to service_url in s3 fileserver docs 2013-10-04 11:57:10 -05:00
Ajith Antony
48fab47e09 Delete the Nic classes from my previous implemntation
Not sure what I did, but when I was squashing, I accidently this in.
2013-10-04 11:49:53 -05:00
Erik Johnson
960a875420 Improve formatting for s3fs fileserver documentation 2013-10-04 11:04:31 -05:00
Erik Johnson
f6e521a9e3 Add fileserver_backend to master configuration page 2013-10-04 11:04:14 -05:00
Joseph Hall
107a4085b5 Merge pull request #7613 from s0undt3ch/hotfix/lint
Some PEP8 Lint fixes
2013-10-04 08:25:03 -07:00
Pedro Algarvio
aae82dded8 Let's not trigger PEP8 errors in salt.version for now. This will be better handled in the near future. 2013-10-04 16:10:18 +01:00
Pedro Algarvio
062eb1d22e Fix PEP-8 E221, E241, E302, E303, W291 and W293 2013-10-04 16:09:45 +01:00
Thomas S Hatch
351a4e0067 Add auto auth system for testing eauth 2013-10-03 18:21:45 -06:00
Joseph Hall
adaee0ede9 Merge pull request #7612 from holmboe/idiomatic-match
Idiomatic regexp match
2013-10-04 07:47:12 -07:00
Henrik Holmboe
6209f7386f Idiomatic regexp match 2013-10-04 16:44:14 +02:00
Joseph Hall
2ee8376317 Merge pull request #7611 from holmboe/virt-pylint
Pylint fixups
2013-10-04 07:40:13 -07:00
Henrik Holmboe
905cad23e1 Sink is a valid unused argument 2013-10-04 16:30:15 +02:00
Henrik Holmboe
9d8778bdfb Verticalize code 2013-10-04 16:21:48 +02:00
Henrik Holmboe
8eac87d5a4 Fix indentation in YAML example
Mixed 2 and 3 space indentations.
2013-10-04 16:18:36 +02:00
Henrik Holmboe
8db7f0172c Unify filename var with other _prepare_*() functions 2013-10-04 16:16:15 +02:00
Henrik Holmboe
8d90c7c111 Detect "FIX" comments with pylint 2013-10-04 16:15:00 +02:00
Henrik Holmboe
a4de2c1ae7 Pylint fixes 2013-10-04 16:14:31 +02:00
Thomas S Hatch
d22fc3bbb4 Merge pull request #7609 from terminalmage/issue7605
Convert augeas values passed to setvalue() to strings
2013-10-04 07:10:02 -07:00
Erik Johnson
70e1e1549a Convert augeas values passed to setvalue() to strings
This fixes an issue where numeric values would fail because the
setvalue() function tries to compare them using str.startswith().
2013-10-04 08:37:08 -05:00
Pedro Algarvio
7e27427b14 Merge pull request #7608 from s0undt3ch/hotfix/lint
Some PEP8/Pylint fixes
2013-10-04 05:40:15 -07:00
Pedro Algarvio
4c15422828 Merge pull request #7607 from s0undt3ch/features/named-salt-versions
Fix remaining test cases and some minor fixes for named versions support
2013-10-04 05:39:50 -07:00
Pedro Algarvio
bdb8b37f9e Fix PyLink C0103 2013-10-04 13:30:02 +01:00
Pedro Algarvio
5d5cbec6d3 Fix PyLink E1120 introduced in d3852568 2013-10-04 13:27:14 +01:00
Pedro Algarvio
0a82b52bea Fix PEP-8 E302 2013-10-04 13:17:47 +01:00
Pedro Algarvio
eb5801413a Fix PEP-8 E302 2013-10-04 13:17:29 +01:00
Pedro Algarvio
3c4f33a935 Adapt remaining test cases which relied on old versioning scheme. 2013-10-04 13:10:35 +01:00
Pedro Algarvio
f355dbcfc5 The format version holder does not get auto populated in the ret warnings. 2013-10-04 13:10:35 +01:00
Pedro Algarvio
62f62ef359 Prefix deprecation warning versions with Salt for clarity. 2013-10-04 13:10:35 +01:00
Thomas S Hatch
bb0ca15ebc Merge pull request #7187 from ajithhub/nics_as_list
Reorganize NIC Profiles as list of interfaces
2013-10-04 04:35:18 -07:00
Thomas S Hatch
867df840f9 Merge pull request #7606 from malinoff/fix-wrong-return
Fixed wrong return statement
2013-10-04 04:33:12 -07:00
Thomas S Hatch
d75ad1fb89 Merge pull request #7603 from s0undt3ch/features/named-salt-versions
Add support for the future Salt named versions
2013-10-04 04:32:43 -07:00
Thomas S Hatch
42bbfd9e0c Merge pull request #7582 from scott-w/hg_clean
Hg Clean
2013-10-04 04:30:02 -07:00
Thomas S Hatch
f7f4e0741e Merge pull request #7575 from whiteinge/django-admin-path
Fail if django-admin script cannot be found; also check without .py ext
2013-10-04 04:28:52 -07:00
Thomas S Hatch
05c940930f Merge pull request #7573 from whiteinge/gen_hash_grains
Added function to generate a password or key and store in local grains
2013-10-04 04:28:38 -07:00
Dmitry Malinovsky
6deb60666c Fixed wrong return statement 2013-10-04 17:48:00 +07:00
Scott Walton
456d625619 Fixed merge conflict for #7395 2013-10-04 10:33:59 +01:00
Pedro Algarvio
b2c0ff758e Rename version_info_or_name to the more generic version. 2013-10-04 10:09:53 +01:00
Pedro Algarvio
1c191fb8bf Support named version strings mathematical comparison. 2013-10-04 09:53:51 +01:00
Pedro Algarvio
738902b322 Update current deprecation messages to use named versions. 2013-10-04 09:53:51 +01:00
Pedro Algarvio
f0b78cd916 Format version on deprecation messages.
Add a test case to check if a deprecation message get it's `version` format holder properly populated.
2013-10-04 09:53:51 +01:00
Pedro Algarvio
a9ceedb5eb warn_until and kwargs_warn_until are now aware of named versions.
Updated the warnings tests cases accordingly.
2013-10-04 09:53:50 +01:00
Pedro Algarvio
8c9fe2c5c1 Fix the kwargs_warn_until unit test case. 2013-10-04 09:53:50 +01:00