valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,375 Commits 24 Branches 182 Tags 341 MiB
336fbb03bc
Commit Graph

69375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Megan Wilhite
2c6326f14a fix tests for file.blockplace to remove newline (#33082) 2016-05-06 08:44:20 -06:00
Bo Maryniuk
3ca203eb8e Bugfix (follow-up): setting priority requires non-positive integer 2016-05-06 13:27:55 +02:00
Bo Maryniuk
79a46e091c Add repo config test 2016-05-06 12:57:52 +02:00
Bo Maryniuk
222b8369ca Add test data for repos 2016-05-06 12:57:36 +02:00
Bo Maryniuk
b746fa35f0 Bugfix: Restore boolean values from the repo configuration 2016-05-06 12:29:48 +02:00
yobo
1e11c2dd9e Fix typo 
Fix the typo ect->etc。
 2016-05-06 14:48:16 +08:00
Mike Place
bea1e2661d Merge pull request #32904 from dmurphy18/automate_signing 
Automate signing
 2016-05-05 17:37:53 -07:00
Justin Findlay
a2c927b173 ssh docs: install py-2.6 for RHEL 5 2016-05-05 16:16:54 -06:00
Chandler
fececb5663 Delete extra space (#33072) 2016-05-05 11:11:33 -06:00
Mike Place
200af076db Catch IOLoop RuntimeError on CLI exit (#33070) 
Closes 32899

Fises
 2016-05-05 10:31:09 -06:00
David Murphy
ab61a37324 Disable pylint warning for unused imports 2016-05-05 10:00:47 -06:00
Mike Place
0ebeb587a9 Merge pull request #32677 from gladiatr72/utils.boto__populate_salt_dunder__fix_region_arg_getting_stomped 
It doesn't seem like there was a populated salt dunder within the
 2016-05-05 07:45:09 -07:00
Mike Place
6b57ce390f Merge pull request #32803 from jpeach/trafficserver-use-traffic-ctl 
Use traffic_ctl in the trafficserver state and module.
 2016-05-05 07:39:26 -07:00
Mike Place
fb89877cf2 Merge pull request #32892 from isbm/isbm-zypper-env-variables 
Resolve Zypper locks on asynchronous calls
 2016-05-05 07:34:59 -07:00
Andrew Hammond
dd20299087 Refactor ipset tests (#32973) 
* remove spurious return

* refactor state.ipset tests

* ipset comments: consistency and correct english

* trim out broken code
 2016-05-05 07:31:49 -07:00
Aditya Kulkarni
df6296e3ce Replace args and kwargs (plural) by arg and kwarg (singular) for `RunnerClient` (#32938) 
* Replace args and kwargs (plural) by arg and kwarg (singular)

* Add test and deprecation warning

* Add deprecation warning
 2016-05-05 07:31:08 -07:00
Kevin Quinn
581f9d328a Fix 'present' option when used without 'key_type' (#32965) 2016-05-05 07:27:30 -07:00
Tarjei Husøy
29a1b233f7 Make pip.install upgrade=True stateful (#32976) 
Will now only report changes if anything was actually
either installed or upgraded, although the output does not
distinguish between those two cases.
 2016-05-05 07:26:05 -07:00
Shane Lee
280d10af01 rewrite win_service.py (#32998) 
* Rewrite service.get_all

* Add service.info

* Add try/except for service not found

* Simplify raise error

* Add lookup dicts for service.info

* Fix lookup dictionaries

* Add Description to service.info

* Add additional status details

* Add service.modify function

* Fix _get_service_handles function

* Fix modify function, transition others

* Modified enable, disable, enabled, and disabled

* Fix service.disable

* Add documentation

* Find mismatched case service names

* Fix some lint

* Fix unit tests

* Fix lint in win_service_test

* Skip tests that will fail when WINAPI not available
 2016-05-05 07:20:55 -07:00
Loren Gordon
a194e08c1d Preserve existing, unspecified network settings (#33007) 
* Preserve existing, unspecified network settings

* When building the network configuration, retain any existing
settings that are not explicitly specified by the user.

* Also adds support to the network template for the NETWORKING_IPV6
configuration setting.

Fixes #33006

* Gate new behavior behind param `retain_settings`

Add a new parameter, `retain_settings`, to gate the new behavior.
If this parameter is False (the default), the function will use the
previous behavior of removing unspecified network settings.

* Add note to network state about the new param
 2016-05-05 07:18:40 -07:00
Megan Wilhite
61d126cb98 add test for installing package while using salt-call --local (#33025) 
* add test for installing package while using salt-call --local

* fix pylint
 2016-05-05 07:17:12 -07:00
Chandler
fb11e5873c Add reactor documentation (#33034) 
* Add gitfs info to reactors page

* Add gitfs info to reactors page

* Update index.rst
 2016-05-05 07:15:52 -07:00
Ronald van Zantvoort
3e0bf233ee Add fun_args to scheduled return data (part of #24237) (#33039) 
* Add fun_args and fun_kwargs to scheduled return data (part of #24237)

* scheduled return data (part of #24237): Improved fix for fun_args
 2016-05-05 07:15:26 -07:00
Thomas S Hatch
264c0d4c35 Don't append a newline when creating new content with blockreplace (#33049) 
Fix #12422
 2016-05-05 07:11:55 -07:00
Nicole Thomas
54b783a0b0 Pass all data to batch.run() call when using --failhard (#33048) 
Fixes #24996
 2016-05-05 07:11:16 -07:00
Nicole Thomas
2dbfa55f06 Display command output when command fails with batch + failhard options (#33050) 
* Display command output when command fails with batch + failhard options

Fixes #32452

* Use 'res' instead of 'ret' in error message to see minion id
 2016-05-05 07:11:01 -07:00
Rob Nagler
da1a005f49 Fix #33033: document need to install docker-py (#33051) 2016-05-05 07:10:37 -07:00
Nicole Thomas
add9199d34 Allow security_groups kwarg for boto_elb.present to be string or list (#33053) 
Fixes #33041

Also added documentation for examples on how to use it.
 2016-05-05 07:09:22 -07:00
Mike Place
e9c94a4141 Skip Unicode test if the system does not have a filesystem encoding set (#33057) 
In the case where a user does not have the LANG env set,
Python can't figure out how to encode Unicode during a popen call.

I could not find any combination of tricks, including setting the encoding
or the locale or the environment variable itself in the call to popen that
would mitigate this issue. This may well be a bug in the Python stdlib itself.
 2016-05-05 07:06:07 -07:00
Nicole Thomas
111701c8bb [2015.8] Merge forward from 2015.5 to 2015.8 (#33054) 
* Add run_on_start docs to schedule.rst (#32958)

Fixes #22580

* Backport #33021 manually to 2015.5 (#33044)

* Saltfile with pillar tests (#33045)

* add file.managed with pillar data tests

* do not require git for other tests

* Whitespace...
 2016-05-05 07:05:55 -07:00
Justin Anderson
1066063a19 File and User test fixes for 2015.8 on Fedora23 (#33056) 
* Fix failing user present test

* Fix file_test.test_symlink failure on 2015.8
 2016-05-05 07:05:10 -07:00
Andrew Hammond
e2d3390596 cloud.query needs to define mapper.opts (#33061) 2016-05-05 07:03:51 -07:00
Justin Anderson
6d3e4e8935 File and User test fixes for 2015.5 on Fedora23 (#33055) 
* Fix file_test.test_symlink on 2015.5

* Fix failing user present test
 2016-05-05 07:00:59 -07:00
Megan Wilhite
d48b2b8b52 test pillar.items output (#33060) 2016-05-05 06:51:27 -07:00
Jεan Sacren
398793bfc0 Fix minor document error of test.assertion (#33067) 2016-05-05 06:50:46 -07:00
jacobhammons
56acdbd559 Merge pull request #33065 from jacobhammons/mocks 
Mocks for salt.modules.junos, salt.proxy.junos, salt.renderers.dson, …
 2016-05-04 21:35:57 -06:00
Jacob Hammons
e4ceae56f5 Mocks for salt.modules.junos, salt.proxy.junos, salt.renderers.dson, salt.states.netntp, salt.proxy.napalm. Refs https://github.com/saltstack/salt/pull/32947 
Removes :exclude-members: from salt.states.netntp since Sphinx does not like this.
 2016-05-04 21:35:18 -06:00
jacobhammons
48e6ebac45 Merge pull request #33063 from jacobhammons/napalm-docs 
removes `:exclude-members:` from automodule
 2016-05-04 20:32:46 -06:00
Jacob Hammons
db9258cff2 It appears that sphinx chokes when :exclude-members: is included without any arguments. Refs https://github.com/saltstack/salt/pull/32947 2016-05-04 20:31:24 -06:00
Nicole Thomas
f97b5d5531 Back-port #33030 to 2015.8 (#33040) 
* When we restart the minion we should show the error that caused it

* looks better with a newline
 2016-05-04 15:18:43 -07:00
Justin Findlay
a78bbd0544 Update mac_assistive module for El Capitan (10.11) (#33047) 
* modules.mac_assistive int tests: wrap args in list

* modules.mac_assistive.install: match schema on El Capitan

* modules.mac_assistive: remove redundant LooseVersion

* modules.mac_assistive unit tests: mock __grains__
 2016-05-04 15:34:03 -06:00
Archie
f060ba903e Fix a typo (#33052) 2016-05-04 15:20:27 -06:00
Megan Wilhite
f8757631b2 Saltfile with pillar tests (#33045) 
* add file.managed with pillar data tests

* do not require git for other tests
 2016-05-04 14:37:57 -06:00
Thomas S Hatch
1d7892421e Backport #33021 manually to 2015.5 (#33044) 2016-05-04 14:34:29 -06:00
Nicole Thomas
c8740eea59 Merge pull request #33042 from thatch45/doc_req 
Add clarity on docs for require sls
 2016-05-04 12:25:20 -06:00
Nicole Thomas
6c69bac56f Merge pull request #33032 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-05-04 10:28:23 -06:00
Thomas S Hatch
813f27e807 Add clarity on docs for require sls 2016-05-04 10:18:19 -06:00
Nicole Thomas
e90a50142a Update the docs for saltutil.find_job to be more clear/accurate (#33017) 
* Update the docs for saltutil.find_job to be more clear/accurate

* Spelling fix
 2016-05-04 09:15:33 -07:00
Justin Findlay
186352a8b8 fix dimensiondata, gce unit test certs on MacOS (#33020) 2016-05-04 09:09:02 -07:00
Alexander Backlund
883aae73dc win_network.ping: add timeout and return_boolean (#33038) 
* win_network.ping: add timeout and return_boolean

* win_network.ping: divide timeout by tries

Divide timeout by tries to mimic BSD behaviour. Specifying
a timeout of 10 seconds would take a Windows minion four times
 longer than Linux to return when a target could not be reached.

* win_network.ping: minor doc formatting
 2016-05-04 08:55:23 -07:00