valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
15,753 Commits 24 Branches 182 Tags 341 MiB
dc5a07fdb9
Commit Graph

15753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
dc5a07fdb9 Merge pull request #6339 from terminalmage/quickfix 
pip: deprecate runas param
 2013-07-26 15:46:55 -07:00
Erik Johnson
aa6918da5d remove unnecessary **kwargs 2013-07-26 17:44:30 -05:00
Erik Johnson
203c391d41 use salt.utils.warn_until for deprecation warning 2013-07-26 17:38:14 -05:00
Erik Johnson
635ddec315 Add proper deprecation warning for runas arg in pip module 
Also remove the ability to use runas interchangeably in the state. If
we're going to deprecate it, no need to let people get used to using
runas in their states.
 2013-07-26 17:21:33 -05:00
Erik Johnson
1d9599ca63 pip: Make runas and user work interchangeably 
The pip state uses "user", while the module uses "runas".  This needs to
be unified in 0.17.0, but until then this commit makes these arguments
interchangeable.
 2013-07-26 16:21:48 -05:00
David Boucha
4ee5284569 Merge pull request #6337 from UtahDave/develop 
Use proper escapes for Travis' sanity
 2013-07-26 11:42:43 -07:00
David Boucha
798d891417 Use proper escapes for Travis' sanity 2013-07-26 12:41:48 -06:00
Joseph Hall
294d668385 Merge pull request #6336 from terminalmage/quickfix 
bsd_shadow: add note on escaping dollar signs
 2013-07-26 11:20:33 -07:00
Erik Johnson
335f077ac5 bsd_shadow: add note on escaping dollar signs 2013-07-26 13:18:23 -05:00
Colton Myers
197d8dab0f Merge pull request #6334 from UtahDave/develop 
Escape the $s because they're being interpolated
 2013-07-26 11:07:38 -07:00
David Boucha
65dde6bff6 Escape the $s because they're being interpolated 2013-07-26 11:59:50 -06:00
Thomas S Hatch
45cb885301 Merge pull request #6331 from terminalmage/docs 
Lots of docs on salt fileserver environments
 2013-07-26 10:33:24 -07:00
Thomas S Hatch
5aa4b8206b Merge pull request #6332 from d--j/patch-1 
Make state.show_{highstate,lowstate,sls} work with PyDSL
 2013-07-26 10:32:46 -07:00
Daniel Jagszent
9c74fc8a9e Make state.show_{highstate,lowstate,sls} work with PyDSL 
PyDSL needs an active HighState. If you have any sls file that uses the "pydsl" renderer you cannot use state.show_highstate, state.show_lowstate and state.show_sls at the moment.
Pushing the HighState on the active queue fixes this.
 2013-07-26 19:27:59 +02:00
Erik Johnson
742fdf9e63 Add link to step 4 of walkthrough to main docs index page 2013-07-26 12:13:51 -05:00
Erik Johnson
a7110e9305 Add practical example 2013-07-26 12:13:32 -05:00
Thomas S Hatch
579f900be6 Merge pull request #6328 from johnnoone/load-jinja-tag 
Load jinja tag
 2013-07-26 09:24:26 -07:00
Thomas S Hatch
a25f715a82 Merge pull request #6311 from felskrone/add_minion_tracking_and_timeout 
changed timeout from 9999 to self.opts['timeout'] which is the user spec...
 2013-07-26 09:21:55 -07:00
Thomas S Hatch
47b82644c4 Merge pull request #6308 from s0undt3ch/hotfix/malformed-pillar-sls 
No general exception catching while rendering pillar
 2013-07-26 09:16:30 -07:00
Thomas S Hatch
beb8b6a76c Merge pull request #6321 from basepi/pkgrepo5517 
Sort 'comps' and 'line' when comparing Debian repos, Fix #5517
 2013-07-26 09:15:51 -07:00
Colton Myers
94f152bf94 Don't sort the repo title 2013-07-26 09:28:22 -06:00
Joseph Hall
4d11db195a Merge pull request #6325 from go8ose/note-pillar-include-version 
Mention in pillar topic which version introduced pillar includes.
 2013-07-26 07:29:20 -07:00
Joseph Hall
04914f6b1a Merge pull request #6327 from Anbcorp/bridge_fixes 
Fix #6326: bridge.show returns none when no bridge is found
 2013-07-26 07:28:48 -07:00
Benoit Depail
9d2ccc9324 Fix #6326: bridge.show returns none when no bridge is found 2013-07-26 14:43:27 +02:00
Geoff Crompton
a6b11e3424 Mention in pillar topic which version introduced pillar includes. 2013-07-26 20:28:10 +10:00
Xavier Barbosa
45677a9875 added doc 2013-07-26 09:30:41 +02:00
Xavier Barbosa
c1b6e06a0f added load tag, and revamped parsing 2013-07-26 09:30:41 +02:00
Pedro Algarvio
d52b109cdd No general exception catching while rendering pillar. Refs #6305. Refs #5910. 
* All errors while processing pillar data are now logged besides being returned.
* Removed the general exception catch. All we need to is check for the expected data type. If it ain't, log the error and continue to the next iteration.
* Added a mocked test case which besides testing the issue reported on #5910, also tests for the proper includes data format and if salt fails accordingly and even if common data is merged.
 2013-07-26 07:04:32 +01:00
Thomas S Hatch
5de7cd517f Merge pull request #6307 from s0undt3ch/hotfix/pylint-anomalous-backslash 
Strings containing backslashes should either be escaped or raw strings.
 2013-07-25 21:40:11 -07:00
Thomas S Hatch
99dfe0cb92 Start on state file tracking 2013-07-25 22:33:20 -06:00
Erik Johnson
49839b72aa Add a 4th step to the states tutorial 
This adds a step showing how file roots can be used to "promote" states
from dev -> QA -> prod.
 2013-07-25 20:41:21 -05:00
Colton Myers
80ea57ea31 Only sort everything after the URL in the line 2013-07-25 17:28:19 -06:00
Joseph Hall
bb3209ce81 Merge pull request #6320 from terminalmage/quickfix 
Fix pylint compatibility in travis
 2013-07-25 16:17:46 -07:00
Colton Myers
27c73e2a77 Sort 'comps' and 'line' when comparing Debian repos, Fix #5517 2013-07-25 17:10:21 -06:00
Erik Johnson
8ef9155dcd Fix pylint compatibility in travis 
See https://github.com/saltstack/salt/pull/6304#issuecomment-21590082
 2013-07-25 17:51:25 -05:00
Joseph Hall
d1a769dae1 Merge pull request #6315 from basepi/pecl6214 
Add parameter for forcing PECL versions, Fix #6214
 2013-07-25 15:42:40 -07:00
Joseph Hall
f32f715305 Merge pull request #6319 from cvrebert/patch-4 
pillar: specify explicit exception type in `except` clause
 2013-07-25 15:41:46 -07:00
Joseph Hall
c8416c3edf Merge pull request #6318 from FireHost/fix_root_valid_id 
Verify minion ids in pki_dir, not hardcoded path.
 2013-07-25 15:41:01 -07:00
Joseph Hall
2d8d5e647a Merge pull request #6317 from chrisgilmerproj/develop 
Allow space delimited lists for targeting
 2013-07-25 15:40:34 -07:00
Chris Rebert
36382d1007 pillar: specify explicit exception type in except clause 
************* Module salt.pillar
W0702:334,20:Pillar.render_pillar: No exception type(s) specified
 2013-07-25 15:27:24 -07:00
Aaron Tygart
74649dd3bd Verify minion ids in pki_dir, not hardcoded path. 2013-07-25 17:19:58 -05:00
Erik Johnson
1a9f069bf0 Document how top files are compiled from different envs 2013-07-25 17:11:33 -05:00
Chris Gilmer
11ac394a52 Fix command help text 
Indicate that space delimited lists work
 2013-07-25 15:00:13 -07:00
Chris Gilmer
ecce87a9a7 Allow split of list using spaces. 
This change checks for comma existence and if its not there splits based on spaces.  Should have identical use as previously.  It also solves the problem of giving non-comma-delimited-output to salt from other programs.
 2013-07-25 14:58:08 -07:00
Colton Myers
2826fc6503 Fix some formatting (line length) 2013-07-25 15:49:50 -06:00
Erik Johnson
a52773e940 Merge pull request #6316 from terminalmage/docstring-tweaks 
Update mysql docstrings to reflect new features
 2013-07-25 14:17:30 -07:00
Erik Johnson
ed6047c971 Update mysql docstrings to reflect new features 2013-07-25 16:16:13 -05:00
Colton Myers
645705e9b4 Add force to docstring 2013-07-25 15:08:00 -06:00
Colton Myers
3bacf6655c Fix line length in states/pecl.py 2013-07-25 15:05:00 -06:00
Colton Myers
00a654fe0f Add force parameter to pecl.install (forcing version), Fix #6214 2013-07-25 15:03:27 -06:00