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
38,779 Commits 24 Branches 182 Tags 341 MiB
e18190bc04
Commit Graph

38779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel M Smith
3cf05c1fe3 Updated unit tests to use the new naming convention for peer Raet 2014-10-23 15:02:16 -06:00
Thomas S Hatch
e590e492d9 Merge pull request #16815 from Tanoti/fix_archive_state_error_msg 
Fix state.archive.extracted invalid archive type error msg
 2014-10-23 14:59:16 -06:00
Thomas S Hatch
7a6fa74c52 Merge pull request #16855 from thatch45/lyft-boto-asg-better-error-messages 
Lint for Lyft boto asg better error messages
 2014-10-23 14:26:30 -06:00
Tanoti
c7ae6dbbc9 Merge branch 'develop' into add-file.move-to-modules 2014-10-23 21:13:51 +01:00
Thomas S Hatch
053adb76fc Merge pull request #16833 from janek-warchol/patch-1 
Fix external link formatting in glossary
 2014-10-23 14:11:24 -06:00
Thomas S Hatch
77a795bd07 Merge pull request #16844 from fictivekin/fix-releasecandidate-doc-version 
change Release Candidate installation doc from rc3 to rc4
 2014-10-23 14:10:29 -06:00
Thomas S Hatch
6f2a3c745b Merge pull request #16838 from felskrone/optional_sreq_caching 
Optional sreq caching in ZeroMQ-transport
 2014-10-23 14:07:30 -06:00
Thomas S Hatch
743586e53b Merge pull request #16837 from felskrone/cachecli_only_with_concache 
if con_cache is inactive, dont create con_cache-client
 2014-10-23 14:06:40 -06:00
Thomas S Hatch
6d29441fb2 Merge pull request #16836 from opdude/2014.7 
Return empty dict for list_pkgs(purge_desired=True) with macports
 2014-10-23 14:05:53 -06:00
Mike Place
dcabe205d8 Use a minions saltenv if none is specified 
Fixes #16784

WARNING: This could be a behaviour change for some people. Consider
merging into develop instead.
 2014-10-23 14:01:41 -06:00
Thomas S Hatch
b57b83d59f Merge pull request #16829 from feth/pythonicization 
Small pythonic rewites & optim
 2014-10-23 14:01:14 -06:00
Thomas S Hatch
95976bccf0 Merge pull request #16823 from cachedout/develop_loader_reload 
Attempt to resolve relative requisites on minion start
 2014-10-23 13:56:55 -06:00
Thomas S Hatch
674b50acb3 Merge pull request #16818 from cachedout/issue_16817 
LazyLoader with __virtual__ support
 2014-10-23 13:53:49 -06:00
Mike Place
61aa747f7e Allow localclient to specify jids 
Since the API just passes in kwargs, this should float up the chain
fairly seamlessly.

Refs #15763
 2014-10-23 13:52:35 -06:00
Thomas S Hatch
25a9d2d699 Merge pull request #16809 from felskrone/disable_mine_scheduler 
Only add mine.update to schedule if function is available
 2014-10-23 13:47:37 -06:00
Thomas S Hatch
ed12f4c984 Merge pull request #16805 from thatch45/agg_doc 
fix docs for mod_aggregate per #16575
 2014-10-23 13:46:33 -06:00
Thomas S Hatch
7705c13eb6 lint 2014-10-23 13:43:24 -06:00
Mike Place
5c233c23a2 Catch error conditions in quota.get_mode 
Closes #16381
 2014-10-23 13:43:24 -06:00
Thomas S Hatch
ceb07ef000 Merge pull request #16741 from s0undt3ch/hotfix/use-vt-has-unread-data 
VT now consumes it's output when iterating using its `has_unread_data` attribute
 2014-10-23 13:41:23 -06:00
Thomas S Hatch
5f2dab18be lint for #16720 2014-10-23 13:38:51 -06:00
Thomas S Hatch
6b16a0d4f6 Merge branch 'boto-asg-better-error-messages' of https://github.com/lyft/salt into lyft-boto-asg-better-error-messages 2014-10-23 13:35:56 -06:00
Thomas S Hatch
3a35764a27 Merge pull request #16848 from terminalmage/helium-rpm-notice 
Add notice of new packages for Helium release
 2014-10-23 13:34:36 -06:00
Thomas S Hatch
fb951ba927 Merge branch 'jimmystewpot-master' into develop 2014-10-23 13:29:35 -06:00
Thomas S Hatch
1638e58245 Merge branch 'master' of https://github.com/jimmystewpot/salt into jimmystewpot-master 
Conflicts:
	doc/topics/cloud/aws.rst
 2014-10-23 13:29:24 -06:00
Joseph Hall
59947b8d82 Merge pull request #16852 from s0undt3ch/2014.7 
Add missing import
 2014-10-23 12:23:04 -06:00
Mathieu Le Marec - Pasquet
2b4d7e3080 Support for vt in pip & venv modules 2014-10-23 20:18:44 +02:00
Thomas S Hatch
b06b21c8a9 Merge pull request #16785 from bahadir/add-batch-timeout 
Don't use hardcoded timeout value in batch mode.
 2014-10-23 11:59:29 -06:00
Mike Place
5ec3d05bc7 Add master_alive_interval to stock minion config 2014-10-23 11:47:00 -06:00
Mike Place
3767666ccb Note the presence of master_alive_interval in MM docs. 
Refs #14906
 2014-10-23 11:47:00 -06:00
Pedro Algarvio
1ac6403d7a Add missing import 2014-10-23 18:42:54 +01:00
Joseph Hall
d0f968da7f Merge pull request #16846 from terminalmage/clarify-docs 
Clarify a couple links in the docs
 2014-10-23 11:22:17 -06:00
vs
b814c09cab provide con_cache in the opts 2014-10-23 19:08:08 +02:00
Mike Place
cd95940dc9 Forgot to take out debug 2014-10-23 11:05:03 -06:00
Erik Johnson
d19c6b16ce Improve wording of RPM changes in helium release notes 2014-10-23 12:00:35 -05:00
Erik Johnson
b261c663fa Add notice of new packages for Helium release 2014-10-23 11:48:40 -05:00
Erik Johnson
ee41260d33 Clarify a couple links in the docs 2014-10-23 10:50:48 -05:00
Tanoti
f5b1681cc0 Add 'move' to modules.file for #16842 2014-10-23 10:44:42 -05:00
Sean Coates
9e1685da6f change Release Candidate installation doc from rc3 to rc4 2014-10-23 11:32:53 -04:00
vs
079ef6d545 pylint fix 2014-10-23 16:59:38 +02:00
Bo Maryniuk
af33be8979 Package lock management support for Zypper 2014-10-23 16:43:09 +02:00
Feth AREZKI
afccd4851a Don't "return log.error(value)" - it's confusing 
Explicitely return nothing: logger.log does not return a useful value
Explicitely lg that some data was lost.
 2014-10-23 16:20:19 +02:00
vs
692252f41b Merge branch 'sreq_cache_option' into optional_sreq_caching 2014-10-23 15:55:26 +02:00
vs
ca9155dd37 if con_cache is inactive, dont create con_cache-client 2014-10-23 06:45:11 -07:00
Daniel Hobley
5f43b060cd Return empty dict for list_pkgs(purge_desired=True) with macports 
This fixes #16828
 2014-10-23 15:27:56 +02:00
Janek Warchoł
e11e42eb39 Fix external link formatting in glossary 2014-10-23 13:45:26 +02:00
Feth AREZKI
056b76c0b9 Optimize attr fetching 
Assign duplicate calls to variables, especially computed dict keys or default values for dict.get().
 2014-10-23 10:14:16 +02:00
Feth AREZKI
a06668a68b Simpler reading of kwargs values! 
This::

    value = adict.get(key, default)

is semantically equivalent to

    if key in adict:
        value = adict[key]
    else:
        value = default

It is also faster ;-)
 2014-10-23 07:58:44 +02:00
Joseph Hall
7c7787ce15 Merge pull request #16824 from cachedout/issue_16413 
Don't let YAML have a newline party
 2014-10-22 18:01:01 -06:00
Mike Place
6cb536045a Don't let YAML have a newline party 
YAML thought it would be super-helpful to break up a long string into
newlines. It was not that helpful.

Fixes #16413
 2014-10-22 16:54:23 -06:00
Seth House
872e3286c0 Swap out SaltConf15 sidebar image for one with better scaled fonts 2014-10-22 16:26:26 -06:00