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
10,013 Commits 24 Branches 182 Tags 341 MiB
e37ad858f9
Commit Graph

10013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Kuan
e37ad858f9 add pydsl renderer doc. 2013-01-20 01:22:16 -05:00
Jack Kuan
897f877bed Added docs for pydsl and fixed a syntax inconsistency. 2013-01-20 01:21:05 -05:00
Thomas S Hatch
b945f64236 Merge pull request #3337 from s0undt3ch/develop 
`client_config` should also support receiving it's own defaults.
 2013-01-19 21:55:22 -08:00
Pedro Algarvio
067b7f034a client_config should also support receiving it's own defaults. 2013-01-20 05:53:01 +00:00
Pedro Algarvio
3febceeefc default_include should also be checked against provided defaults. 2013-01-20 05:21:44 +00:00
Thomas S Hatch
4cfed31cbe Fix some of the formatting and use a stock grain so people don't 
go looking for a non standard grain
 2013-01-19 22:15:24 -07:00
Thomas S Hatch
379cd70bf0 Merge pull request #3336 from ydavid365/patch-1 
updated to add an example of other standard top matching types in pillar...
 2013-01-19 21:12:37 -08:00
John Albietz
f6d2914542 updated to add an example of other standard top matching types in pillar files. 
Not sure if you'll like my example, but we should add at least one example of how to use other standard top matching types into the top.sls file.
 2013-01-19 21:04:22 -08:00
Thomas S Hatch
8ed0a4e224 Merge pull request #3335 from s0undt3ch/develop 
Number of commits is not limited to 2 chars.
 2013-01-19 20:19:17 -08:00
Pedro Algarvio
9821022cb3 Number of commits is not limited to 2 chars. 2013-01-20 04:17:41 +00:00
Thomas S Hatch
d9b1997c30 Merge pull request #3334 from s0undt3ch/develop 
Fix `tests.unit.pydsl_test` and `tests.unit.stateconf_test`.
 2013-01-19 20:12:23 -08:00
Pedro Algarvio
3629fe88c0 Fix tests.unit.pydsl_test and tests.unit.stateconf_test. 
No more errors are shown because the configuration files are not readable, and in fact, the minion configuration can be use, unlike what was said in the comment.
 2013-01-20 04:09:07 +00:00
Pedro Algarvio
2686cb6195 Merge branch 'develop' of github.com:saltstack/salt into develop 2013-01-20 03:51:52 +00:00
Pedro Algarvio
69b8aa83f4 Typo correction. 2013-01-20 03:51:09 +00:00
Thomas S Hatch
7359da8a8e Merge pull request #3333 from s0undt3ch/develop 
Allow providing the defaults dictionary to override.
 2013-01-19 19:35:25 -08:00
Pedro Algarvio
b4e1dbac7d Allow providing the defaults dictionary to override. 2013-01-20 03:31:11 +00:00
Thomas S Hatch
fe6c04881f Merge pull request #3332 from s0undt3ch/develop 
Some more external sub-classing and code re-use support
 2013-01-19 19:20:30 -08:00
Pedro Algarvio
a739a07378 Protect against the log_path being set to None. 2013-01-20 03:16:07 +00:00
Pedro Algarvio
6f8183090e Allow providing the environment variable to load configuration from. 
Now, `config_master`, `config_minion` and `client_config` accept the proper environment variable to load configuration from. This allows projects sub-classing salt's master and minion, for example, to provide their own environment variable.
 2013-01-20 03:12:23 +00:00
Thomas S Hatch
86ed822148 Single quotes 2013-01-19 18:22:54 -07:00
Thomas S Hatch
2a3ac0b7c9 Remove config util module 2013-01-19 00:13:37 -07:00
Thomas S Hatch
e08f8597ac Merge pull request #3326 from s0undt3ch/hotfix/git-describe-parsing 
Harden `git describe` parsing so it does not fail on awkward situations.
 2013-01-18 23:12:35 -08:00
Thomas S Hatch
5c2db52f0f Change docs to be third person 2013-01-18 23:33:03 -07:00
Thomas S Hatch
7cce3f0661 Merge pull request #3327 from hvnsweeting/develop 
Doc: add command to run standalone minion
 2013-01-18 22:20:52 -08:00
Thomas S Hatch
ecc7b68b42 Fix adding Range has a hard dep from #3325 
A wizard should know better...
 2013-01-18 23:08:39 -07:00
Thomas S Hatch
1c7dbe1433 Merge pull request #3328 from intchanter/develop 
Fail gracefully as non-privileged user
 2013-01-18 21:49:51 -08:00
Intchanter
83ea1ebcb0 Fail gracefully as non-privileged user 2013-01-18 22:18:56 -07:00
Pedro Algarvio
09bba5b054 git describe sha signatures have a length of 8 chars. 2013-01-19 05:07:41 +00:00
HVN
2ec5605e11 add command to run standalone minion 2013-01-19 11:50:08 +07:00
Pedro Algarvio
7694829219 Also include the number of commits after the found tag. 2013-01-19 04:38:36 +00:00
Pedro Algarvio
d3391f4db0 Harden git describe parsing so it does not fail on awkward situations. 
This issue came up because a user is using custom tags and git describe for him is something like `debian/0.11.1+ds-1-3-ga0afcb`.
Added unittests for this.
 2013-01-19 02:31:00 +00:00
Thomas S Hatch
3e9efc23ba Merge pull request #3325 from jacksontj/develop 
Adding range to compound matcher
 2013-01-18 17:56:36 -08:00
Thomas Jackson
ebbe102fe5 Adding range to compound matcher 
Adding docs for range compound matcher
 2013-01-18 17:54:48 -08:00
Thomas S Hatch
2880105239 Merge pull request #3324 from pcrews/develop 
Modify the mysql module to be more consistent on SELECT queries
 2013-01-18 17:33:51 -08:00
pcrews
e3fd431675 Modified the mysql.py module to alter the behavior when 0 rows are returned. This is because some SELECT statements might return 0 rows and the difference in returned verbiage is problematic. We alter the code so that if the query is a SELECT, we always describe the results as 'rows returned'. If the query does not start with that, then we use 'rows affected' 2013-01-18 15:32:31 -08:00
Thomas S Hatch
135bf7e972 Import SaltMasterError 2013-01-18 13:46:08 -07:00
Thomas S Hatch
e2eeac7a12 Add an error to the fileserver updates in no fileservers are present 2013-01-18 13:43:55 -07:00
Thomas S Hatch
08471effee Merge pull request #3320 from kjkuan/pydsl-updates 
Pydsl updates
 2013-01-18 11:27:16 -08:00
Thomas S Hatch
ad866354cb Merge pull request #3319 from archtaku/develop 
Fix Ubuntu bug in pkg.purged, pkg.removed states
 2013-01-18 11:25:39 -08:00
Jack Kuan
a678901c48 Fix test cases for py2.6. 2013-01-18 14:14:42 -05:00
Thomas S Hatch
351fd0e3fe Tell gitfs to ref the remote refs in the repo fetch 
This lowers overhead and fixes the updae bug, it also fixes
Fix #3315
Fix #3316
As for #3316, use salt-run fileserver.update to explicitly update
instead of waiting for the built in check, checking with every file
lookup would cause far too many calls to the remote git server
 2013-01-18 12:44:19 -06:00
Bruno Clermont
e8f4199cad Add other sources of examples 
I have a lengthy and growing "public" states repository that I build my various clients production on top of it.

some of them can be a little exotic.

and I think that I have the only public example of file.accumulated
 2013-01-18 12:44:19 -06:00
Erik Johnson
576b844645 Fix typo introduced in f0d1043 2013-01-18 12:44:19 -06:00
Erik Johnson
4e0173de78 Prevent traceback using refresh param 
Make the same change as was made in f0d1043 to pacman.py
 2013-01-18 12:44:18 -06:00
Erik Johnson
33a84f2f10 Prevent traceback using refresh param 
This commit forces the 'refresh' param to be cast as a string to keep
things like 'refresh: 123' in a pkg state from causing a TypeError.
 2013-01-18 12:44:18 -06:00
Erik Johnson
8b56e24671 Default refresh to True (zypper) + pep8 fixes 
See #3302
 2013-01-18 12:44:18 -06:00
Erik Johnson
a4de27492b Default refresh to True (yumpkg5) + pep8 fixes 
See #3302
 2013-01-18 12:44:18 -06:00
Wendall Cada
be6be94600 Added unittest support to rpm spec. 2013-01-18 12:44:18 -06:00
Erik Johnson
071b99b5e5 Default refresh to True (yumpkg) + pep8 fixes 
See #3302
 2013-01-18 12:44:18 -06:00
Erik Johnson
da73c8d3b7 Add refresh param + pep8 fixes 
list_upgrades and upgrade are not yet implemented, but I added some
commented-out bits that can be uncommented once these functions are
implemented.
 2013-01-18 12:44:18 -06:00