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
Pedro Algarvio
f028a004ad
Fix the warnings unit test.
...
Since the `warn_until` function now parses and instantiates a `SaltStackVersion`, the `bugfix` part of the version info is always shown.
2013-10-04 09:53:50 +01:00
Pedro Algarvio
800c918729
Let SaltStackVersion be the original one, not a MagicMock'ed one
2013-10-04 09:53:50 +01:00
Pedro Algarvio
b651c2dfc6
Support named salt versions
2013-10-04 09:53:50 +01:00
Pedro Algarvio
e1e8095d23
Merge pull request #7590 from llamallama/develop
...
Fixing grant_option False being evaluated as a string and therefore True
2013-10-04 00:23:43 -07:00
Colton Myers
778d022a84
Merge pull request #7600 from terminalmage/docs
...
Add note about top.sls to the "starting states" tutorial
2013-10-03 18:42:29 -07:00
Erik Johnson
673815b718
Add note about top.sls to the "starting states" tutorial
...
Also cleaned up a bit of a redundancy, and removed a reference to a
section called "State Data Structures" which appears to no longer exist.
2013-10-03 20:30:35 -05:00
Colton Myers
514506f2ac
Merge pull request #7596 from cachedout/develop
...
A minor clarity fix for documentation regarding the extension of Salt.
2013-10-03 17:01:27 -07:00
Pedro Algarvio
3a3e43abda
Merge pull request #7599 from basepi/sshdocs7579
...
Add note about salt-ssh package to salt-ssh docs
2013-10-03 16:47:43 -07:00
Colton Myers
10a7a638c8
Add note about salt-ssh package to salt-ssh docs
2013-10-03 17:18:03 -06:00
Mike Place
0593c3311d
A minor clarity fix for documentation regarding the extension of Salt.
...
I attempted to preserve what I believe to be the original intent of the author but please feel free not to merge these changes if you feel that I've failed in doing so. :]
2013-10-03 14:51:49 -06:00
Joseph Hall
85019e70f8
Merge pull request #7595 from UtahDave/develop
...
Set and get a Windows machine's ntp servers
2013-10-03 13:37:58 -07:00
David Boucha
044936987a
Set and get a Windows machine's ntp servers
2013-10-03 14:34:55 -06:00
Joseph Hall
4644349df1
Merge pull request #7593 from corywright/patch-1
...
Fix typos
2013-10-03 11:59:21 -07:00
Cory Wright
67d11353c4
Fix typos
2013-10-03 14:51:49 -04:00
Ajith Antony
b95a5d9fd0
Virt Template deploy, and serial xml tests
...
- Added virt templates to setup
- moved NIC xml string template to file
- added tests for serial xml
2013-10-03 13:21:34 -05:00
Pedro Algarvio
e8b143c718
Merge pull request #7592 from s0undt3ch/hotfix/lint
...
Logs download should be done in a separate step.
2013-10-03 10:50:48 -07:00
Pedro Algarvio
1a3c11c1ca
Logs download should be done in a separate step.
2013-10-03 18:49:34 +01:00
Joseph Hall
fab7034741
Merge pull request #7589 from UtahDave/develop
...
get and set Windows date and time
2013-10-03 10:32:32 -07:00
Ajith Antony
c7ae3ba592
Nic profile changes
...
- Implement 3 styles of profile definition
- Support both config.options and config.get
- Replaces NIC substituions with template
- xml unit tests fixed up
2013-10-03 12:06:19 -05:00
Chris Jones
c1a2d657ec
added missing s
2013-10-03 12:57:16 -04:00
Chris Jones
077c591e86
Changed remaining 'if grant_option' to 'salt.utils.is_true(grant_option)'
2013-10-03 12:56:28 -04:00
Chris Jones
4bc8f1ddd0
Removed previous fix for grant_option False and am using salt.utils.is_true instead
2013-10-03 12:53:15 -04:00
Ajith Antony
6ce3973c13
added main run to simple.py
2013-10-03 11:50:49 -05:00
Chris Jones
1eb3cd8714
Fixing grant_option False being evaluated as a string and therefore True
2013-10-03 12:23:12 -04:00
Pedro Algarvio
76cccda866
Merge pull request #7588 from s0undt3ch/hotfix/lint
...
Some PEP8 Lint fixes
2013-10-03 09:18:02 -07:00
David Boucha
88b4c5b33d
get and set Windows date and time
2013-10-03 10:07:35 -06:00