Commit Graph

30685 Commits

Author SHA1 Message Date
Elias Probst
ce60e592cc Don't rely blindly on the keys 'alt_device' and 'device_uuid'.
This will cause failures on systems not providing these keys such as
FreeBSD.
2014-05-16 19:03:26 +02:00
Thomas S Hatch
18561e94ad Merge pull request #12819 from cachedout/6612
Doc fix.
2014-05-15 12:14:38 -06:00
Mike Place
63838373a5 Doc fix.
Resolves #6612
2014-05-15 12:08:19 -06:00
Thomas S Hatch
637db374e8 Merge pull request #12789 from cachedout/7963
Docker module lint and test
2014-05-15 11:19:12 -06:00
Thomas S Hatch
d36c202c9c Merge pull request #12816 from basepi/typofix
Fix confusing typo in config.get docstring
2014-05-15 11:18:06 -06:00
Mike Place
423a6fb508 Remove dup name 2014-05-15 10:28:26 -06:00
Colton Myers
cba4d60d39 Fix confusing typo in config.get docstring 2014-05-15 10:20:26 -06:00
Thomas S Hatch
49033752fe Merge pull request #12795 from whiteinge/doc-python-api-cleanup
Python API docs fixes and cleanup
2014-05-15 10:11:00 -06:00
Thomas S Hatch
e17bb179f5 change some strings to comments per #12798 2014-05-15 10:10:08 -06:00
Thomas S Hatch
b42d8cc724 Merge pull request #12798 from dmyerscough/modify-hostname
Allow Debian and Red Hat systems to be renamed
2014-05-15 10:08:50 -06:00
Thomas S Hatch
a1af3b26a3 Merge pull request #12768 from spsoit/adds_ordereddict_to_jinja
Adds support for OrderedDicts in jinja templates.
2014-05-15 10:06:25 -06:00
Thomas S Hatch
4f3bd9ee11 Merge pull request #12800 from eliasp/states-rdp_correct-test-support
Return proper results for 'test=True'
2014-05-15 10:02:54 -06:00
Mike Place
c94d8f71b1 Fixing lint errors.
Re-introduced some kwargs and args there were here originally.
These will require some additional refactoring to fully remove.
2014-05-15 09:53:30 -06:00
Mike Place
a3c848ede8 Heavy linting of docker module and re-do docker tests. 2014-05-15 09:53:30 -06:00
Joseph Hall
7e186bbb4b Merge pull request #12814 from eliasp/patch-1
Typo (successfull → successful)
2014-05-15 09:47:07 -06:00
Elias Probst
202a5b7544 Typo (successfull → successful) 2014-05-15 17:45:55 +02:00
Joseph Hall
a3e750603d Merge pull request #12805 from tankywoo/develop
states.iptables support custom rule filename to save
2014-05-15 07:24:44 -06:00
Joseph Hall
b195e78eba Merge pull request #12797 from gtmanfred/develop
use 3 attr instead of if statement for item.progress
2014-05-15 05:51:36 -06:00
Elias Probst
e0091310ff Return proper results for 'test=True' 2014-05-15 09:24:00 +02:00
Damian Myerscough
c3cd68f262 Allow Debian and Red Hat systems to be renamed 2014-05-14 22:13:51 -07:00
Daniel Wallace
f9f9f10eaf use 3 attr instead of if statement for item.progress 2014-05-14 22:54:03 -05:00
Joseph Hall
e91be299fc Merge pull request #12796 from gtmanfred/develop
don't error if the server doesn't have a progress
2014-05-14 21:36:43 -06:00
Erik Johnson
a9aa0d90f7 Merge pull request #12608 from jond64/pkg.install-reinstall
Pkg.install reinstall
2014-05-14 22:27:56 -05:00
Daniel Wallace
22e1552152 don't error if the server doesn't have a progress 2014-05-14 22:13:51 -05:00
Seth House
d0a7140ae6 Reorganized the Python API docs to be more Python-centric 2014-05-14 19:58:37 -06:00
Seth House
57b26354dd Fixed incorrect documentation on the master/client config functions
Fleshed out the function docstrings and pulled those into the Python API
docs.
2014-05-14 18:49:29 -06:00
Thomas S Hatch
0d9ab156d6 Merge pull request #12787 from rallytime/pylint_fix
Fix for python 3 indexing exceptions
2014-05-14 17:08:14 -06:00
rallytime
16dc0217d9 Fix for python 3 indexing exceptions 2014-05-14 16:25:40 -06:00
Thomas S Hatch
988101cf8d update tests to handle new return data from states 2014-05-14 16:09:27 -06:00
Thomas S Hatch
08cafe2a25 Fix #7328 2014-05-14 16:01:28 -06:00
Thomas S Hatch
4b1ceffa7b change unreachable code 2014-05-14 15:36:42 -06:00
Thomas S Hatch
b2150d94db fix mytypos in my typo fixing 2014-05-14 15:21:36 -06:00
Thomas S Hatch
a0a9060a1b NO FIRST PERSON!!! 2014-05-14 15:18:54 -06:00
Seth House
82dbed876f Merge pull request #12785 from dnd/add_rbenv_to_ruby_gem_docs
Indicate rbenv support in 'gem' module and states
2014-05-14 14:53:36 -06:00
Chad Heuschober
f194f5e2b2 Removes unnecessary collections import. 2014-05-14 16:35:27 -04:00
Chad Heuschober
f4b7422c7d Changed OrderedDict provider to salt.utils.odict for backwards compat with py2.6 2014-05-14 16:31:43 -04:00
Chad Heuschober
1f8c20fadb Adds support for OrderedDicts in jinja templates. 2014-05-14 16:31:43 -04:00
Joseph Hall
740585e919 Merge pull request #12786 from hulu/s3-pylint
use list comprehension instead of filter() to avoid pylint warning
2014-05-14 14:30:22 -06:00
Thomas S Hatch
30d462ac4c Fix #12766
@basepi, I need to manually fix this in 2014.1, don't cherrypick
2014-05-14 14:07:23 -06:00
Thomas S Hatch
10a475ded2 Documentation to fix #6300 2014-05-14 13:56:54 -06:00
Chris Rebert
167f2f6eff use list comprehension instead of filter() to avoid pylint warning
************* Module salt.pillar.s3
salt/pillar/s3.py:247: [W0640(cell-var-from-loop), _refresh_buckets_cache_file.<lambda>] Cell variable saltenv defined in loop

More details: https://github.com/klen/pylama_pylint/blob/master/pylama_pylint/pylint/checkers/variables.py#L150
2014-05-14 12:49:58 -07:00
Steve Valaitis
7df67a858d Indicate rbenv support in 'gem' module and states 2014-05-14 14:49:29 -05:00
Joseph Hall
78b3670d20 Merge pull request #12784 from cvrebert/patch-1
cloud.clouds.nova: rm duplicate import
2014-05-14 13:47:54 -06:00
Chris Rebert
4504b09c83 cloud.clouds.nova: rm duplicate import
************* Module salt.cloud.clouds.nova
salt/cloud/clouds/nova.py:113: [W0404(reimported), ] Reimport 'salt.utils.cloud' (imported line 100)
2014-05-14 12:46:27 -07:00
Thomas S Hatch
2146f06291 Merge pull request #12752 from eliasp/states_pkg-failed_always_true
Don't return 'True' for failing package installations.
2014-05-14 13:39:24 -06:00
Colton Myers
e06c565eda Merge pull request #12778 from cachedout/formatter_tweak
Clean up highstate formatter
2014-05-14 13:34:46 -06:00
Thomas S Hatch
82bfb35346 Merge pull request #12780 from s0undt3ch/develop
Fix unit tests
2014-05-14 13:33:32 -06:00
Thomas S Hatch
cb0d877a8d Revert "lint"
This reverts commit 9e6329ab9a.
2014-05-14 13:32:57 -06:00
Thomas S Hatch
beb02a0594 Merge pull request #12783 from whiteinge/moar-rst-fixes
Moar misc rST fixes
2014-05-14 13:32:15 -06:00
Thomas S Hatch
d5064aab51 Merge pull request #12781 from garethgreenaway/fix_failing_file_unit_test
Fix for unit tests for file state, fix related to symlinks in file module.
2014-05-14 13:31:14 -06:00