valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,560 Commits 24 Branches 182 Tags 341 MiB
ed2a7a7ad1
Commit Graph

67560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
brad-alexander
e7f7aa67d9 Add documentation for transport_opts (#32940) 2016-04-29 09:59:05 -06:00
Justin Findlay
b2d7c81f66 doc.ref.states.ordering: clarify requisite change (#32934) 2016-04-28 15:41:01 -06:00
Nicole Thomas
3f1faec755 Merge pull request #32932 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-04-28 15:30:17 -06:00
rallytime
9033060106 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/archive.py
 2016-04-28 14:22:58 -06:00
Nicole Thomas
df41d5dfb1 mode should default to 'text' (#32928) 2016-04-28 14:16:19 -06:00
Justin Anderson
fa7e32afcc Fixing failures in gce_test and dimensiondata_test (#32921) 
* Fixing failures in gce_test and dimensiondata_test

* Fixed lint
 2016-04-28 14:15:22 -06:00
Nicole Thomas
f581a8218d Remove FileClient class references from docs - it doesn't exist. (#32925) 
* Remove FileClient class references from docs - it doesn't exist.

Replace FileClient class references with mentions of the fileclient.py
module and replace code examples with salt.fileclient.get_file_client
examples.

Fixes #32646

* Don't reference minion import when not used
 2016-04-28 14:14:40 -06:00
Nicole Thomas
31b96dec7b Update contents_grains option with relevant docs (#32922) 
Instead of "works like contents_pillar". Also added grains example.

Fixes #23683
 2016-04-28 13:49:07 -06:00
Nicole Thomas
e60c12640d Merge pull request #32926 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-04-28 13:47:52 -06:00
rallytime
5a184881be Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-04-28 12:33:10 -06:00
Megan Wilhite
1cd6a45b8f specify volume tags in profile configuration (#32908) 2016-04-28 10:14:45 -06:00
Nicole Thomas
85ca86de08 Update docs to warn users that -1 isn't valid for iptables insert state (#32906) 
Fixes #23953

Also clarifies the append state doc to indicate that rules will
always be added to the end of a chain.
 2016-04-28 10:14:28 -06:00
Nicole Thomas
cb68706db2 Allow profile options to be specified in provider file when using maps (#32900) 
Fixes #32510
 2016-04-28 10:07:14 -06:00
Shane Lee
7da7b2329d Remove _get_date_time_format function (#32903) 
* Remove _get_date_time_format function

* Fix incorrect timelib version
 2016-04-28 10:06:44 -06:00
steven 'haji' hajducko
98767d521d Reload renderers for local pillar after gitfs (#32912) 
Because of the way the renderers are lazy loaded when using ext_pillar_first
and gitfs external pillar, the renderers for the local pillar object were
being set to the last loaded gitfs pillar.

This was causing the local pillar to fail to render.  This small fix
forces a reload of the renderers after all the external pillars are done
loading.
 2016-04-28 09:57:25 -06:00
Nicole Thomas
1a55fcb733 Clarify service state opening docs - uses 'service' virtualname (#32880) 
* Clarify service state opening docs - uses 'service' virtualname

Fixes #30855

* Add a few more clarifications to service state docs

And link to service execution modules list.
 2016-04-27 14:32:27 -06:00
Erik Johnson
a98dea7503 archive.extracted: only manage user/group ownership when if_missing is a directory (#32893) 
* Revert "Archive extracted perms update. (#32765)"

This reverts commit 66ba35261c.

* archive.extracted: only manage user/group ownership when if_missing is a directory

There might be a better way to properly enforce this this (such as using
os.chmod on each individual file), but the trouble with doing this right
now is that the archive functions for unzip and unrar do not return neat
lists of files, they just return the CLI output from the unzip/unrar
commands as a list of lines.

Fixes #32801.
 2016-04-27 11:19:08 -06:00
Nicole Thomas
e1b40b3b76 Merge pull request #32884 from terminalmage/fix-incorrect-deprecation-notice 
Fix incorrect deprecation notice
 2016-04-27 09:47:35 -06:00
Bo Maryniuk
7f37961d4b Rename tags 2016-04-27 15:59:05 +02:00
Bo Maryniuk
c55b0fab58 Test DOM parsing 2016-04-27 15:43:35 +02:00
Bo Maryniuk
c54e928e4f Add exception handling test 2016-04-27 15:43:17 +02:00
Bo Maryniuk
3d245bbe84 Parse DOM out of the box, when XML mode is called 2016-04-27 15:42:50 +02:00
Bo Maryniuk
6a98f523ac Add Zypper caller test suite 2016-04-27 15:21:00 +02:00
Bo Maryniuk
f189f90124 Bugfix: always trigger __getattr__ to reset and increment the configuration before the call. 2016-04-27 15:05:57 +02:00
Bo Maryniuk
7e1712dd80 Fix tests according to the new calling model 2016-04-27 14:35:22 +02:00
Bo Maryniuk
3a30b7fbcd Remove an obsolete test case 2016-04-27 14:34:54 +02:00
Bo Maryniuk
6e5877a2ee Add Zypper Call mock 2016-04-27 14:34:31 +02:00
Bo Maryniuk
bb5540cb4a Bugfix: inverted logic on raising (or not) exceptions 2016-04-27 14:34:17 +02:00
Bo Maryniuk
ce9262fe71 Make Zypper caller module-level reusable 2016-04-27 11:14:31 +02:00
Bo Maryniuk
77dc8695af Update docstrings according to the bugfix 2016-04-27 11:13:43 +02:00
Bo Maryniuk
46d86b21d5 Bugfix: accept refresh override param 2016-04-27 11:13:17 +02:00
Bo Maryniuk
cb40618262 Fire an event about released Zypper with its result 2016-04-27 10:04:32 +02:00
Bo Maryniuk
0728f0bc00 Replace string values with the constants 2016-04-27 10:04:15 +02:00
Erik Johnson
b307c5452a Fix incorrect deprecation notice 
The "deprecated" entry refers to when the deprecation path started, not
when the option will be removed.
 2016-04-26 23:52:08 -05:00
Nicole Thomas
2b239ceb6d Merge pull request #32879 from Ch3LL/fix_mac_user_present_test 
add /Users directory for mac minion in user present test
 2016-04-26 16:33:25 -06:00
Nicole Thomas
bba4b760c2 Merge pull request #32877 from Ch3LL/fix_mac_pkg_latest 
fix pkg.latest_version for mac_brew.py
 2016-04-26 16:32:48 -06:00
Ch3LL
3520d496ba add /Users directory for mac minion in user present test 2016-04-26 15:32:11 -06:00
jacobhammons
a2921b9da0 Merge pull request #32878 from jacobhammons/salt-cloud 
added note about updating the bootstrap script in salt-cloud using th…
 2016-04-26 15:09:51 -06:00
Jacob Hammons
3887938727 added note about updating the bootstrap script in salt-cloud using the -u flag, removed the saltconf banner. 2016-04-26 15:08:59 -06:00
Ch3LL
4e81d7bd68 fix pkg.latest_version for mac_brew.py 2016-04-26 14:58:52 -06:00
Nicole Thomas
395b7ad747 Merge pull request #32870 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-04-26 14:01:44 -06:00
Nicole Thomas
c49495a410 Merge pull request #32872 from whiteinge/batch-orch-docs 
Batch orch docs
 2016-04-26 13:25:30 -06:00
Nicole Thomas
71db10fd2c Merge pull request #32869 from rallytime/fix-32861 
Use correct config setting in cloud syndic docs
 2016-04-26 13:13:21 -06:00
Seth House
e6540383a7 Document the batch kwarg added in #26355 2016-04-26 13:02:32 -06:00
Seth House
bf1f357bee Fix incorrect code sample bat -> batch 2016-04-26 12:40:45 -06:00
rallytime
e7a11cbe87 Pylint fix 2016-04-26 12:30:50 -06:00
rallytime
80fcdfb9d8 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/targeting/grains.rst
  - salt/cli/daemons.py
  - salt/exceptions.py
  - salt/minion.py
  - salt/modules/schedule.py
  - salt/scripts.py
  - salt/states/archive.py
 2016-04-26 12:07:42 -06:00
Nicole Thomas
02c681311f Merge pull request #32844 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-04-26 11:38:08 -06:00
rallytime
0e73daa126 Use correct config setting in cloud syndic docs 
Fixes #32861
 2016-04-26 11:32:01 -06:00
Bo Maryniuk
6af3f7141b Check if zypper lock exists and add more debug logging 2016-04-26 19:13:38 +02:00