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
36,215 Commits 24 Branches 182 Tags 341 MiB
001d418fa0
Commit Graph

36215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaditya Talwai
001d418fa0 Add NoneType check for opts in modules.git.init 
`opts` should default to '' in `git.init`, as is the case with all other functions in `modules.git`
 2014-09-02 15:24:15 -07:00
David Boucha
8d69c33b9d Merge pull request #15454 from rallytime/fix_cloud_regression 
Fix cloud regression on develop
 2014-09-02 16:12:46 -06:00
Thomas S Hatch
df7b54b748 Merge pull request #15388 from Setsuna666/feature-ext_pillar-file_tree-nodegroups 
Feature - Add support for node groups in the file tree external pillar module
 2014-09-02 16:08:02 -06:00
Thomas S Hatch
5e2544a1a4 Merge pull request #15374 from cimarronm/module_brew_consistent_run_cmd 
modules.brew call with consistent user
 2014-09-02 16:02:36 -06:00
Thomas S Hatch
b456fce060 Merge pull request #15373 from garethgreenaway/returner_experiments 
Ability to override default returner configuration options.
 2014-09-02 15:57:29 -06:00
Thomas S Hatch
aa0828b629 Merge pull request #15455 from thatch45/davidone-zfs 
merge #15357 with fixes
 2014-09-02 15:56:29 -06:00
Thomas S Hatch
87909096d8 fixes for #15357 2014-09-02 15:55:38 -06:00
Thomas S Hatch
57ecffb947 Merge branch 'zfs' of https://github.com/davidone/salt into davidone-zfs 2014-09-02 15:54:49 -06:00
rallytime
3f9d000194 Fix cloud regression on develop 2014-09-02 15:00:55 -06:00
Mike Place
b646f9f98a Merge pull request #15452 from cachedout/dev_up 
Dev up
 2014-09-02 14:21:57 -06:00
Mike Place
8c737afa1e Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/cloud.py
 2014-09-02 14:20:04 -06:00
Mike Place
f492fa68e6 Merge pull request #15451 from terminalmage/gitfs-docs-corrections 
Remove extraneous word
 2014-09-02 14:17:52 -06:00
Erik Johnson
ba3e0367c6 Remove extraneous word 2014-09-02 15:16:32 -05:00
Colton Myers
582565a739 Merge pull request #15443 from rallytime/fix_salt_cloud 
Remove remote_exists function and add allow_failure=True
 2014-09-02 14:09:14 -06:00
Mike Place
092ab484d6 Merge pull request #15447 from cachedout/dev_up 
Merge up to develop
 2014-09-02 13:58:36 -06:00
Mike Place
be60e25574 Merge branch '2014.7' into develop 2014-09-02 13:56:54 -06:00
Mike Place
3f79183da8 Merge pull request #15446 from terminalmage/gitfs-docs-corrections 
More gitfs docs corrections/clarifications
 2014-09-02 13:56:08 -06:00
Erik Johnson
0a5bc21b58 More gitfs documentation clarifications/corrections 2014-09-02 14:37:52 -05:00
Erik Johnson
ed631d69b5 Add fileserver_backend param to minion config documentation 
Also correct an incorrect rst link target for hash_type
 2014-09-02 14:36:35 -05:00
Erik Johnson
a3c62ef119 Add default value for fileserver_backend 2014-09-02 14:35:03 -05:00
Mike Place
203e0732da Merge pull request #15438 from hulu/mount 
modules.mount.swaps: avoid shadowing `type` built-in
 2014-09-02 12:54:50 -06:00
rallytime
ba934f99f4 Remove remote_exists function and add allow_failure=True 
Fixes #15436

Get the `2014.7` branch inline with the `develop` branch and fix the salt-cloud regression on `develop`.
 2014-09-02 12:40:34 -06:00
Mike Place
208eb60ec6 Merge pull request #15439 from hulu/comment 
utils.network.remotes_on_remote_tcp_port: Use comment instead of string literal
 2014-09-02 12:31:40 -06:00
Mike Place
041d898a8f Merge pull request #15441 from terminalmage/gitfs-docs-corrections 
Gitfs documentation corrections
 2014-09-02 12:27:02 -06:00
Erik Johnson
0ae4a108b7 Clarify outdated information in gitfs walkthrough 
This paragraph predates the addition of pygit2 and dulwich support, and
seems to suggest that GitPython is required for gitfs, when that is no
longer necessarily true. This commit clarifies the wording here.
 2014-09-02 13:22:56 -05:00
Erik Johnson
6e98ef828d gitfs_provider has no default value 2014-09-02 13:22:47 -05:00
Thomas S Hatch
39b107a283 Merge pull request #14820 from steverweber/add_conf_help 
show_timeouts, new default
 2014-09-02 12:13:31 -06:00
Cimarron Mittelsteadt
8326182e5e TST: Updated brew module unit test to patch the appropriate __salt__ functions for the updates to brew module 2014-09-02 11:12:01 -07:00
Chris Rebert
ea7accd13d utils.network.remotes_on_remote_tcp_port: Use comment instead of string literal 
************* Module salt.utils.network
salt/utils/network.py:1022: [W0105(pointless-string-statement), remotes_on_remote_tcp_port] String statement has no effect
 2014-09-02 10:54:51 -07:00
Chris Rebert
a36b7a85b4 modules.mount.swaps: avoid shadowing type built-in 2014-09-02 10:53:22 -07:00
Thomas S Hatch
294ea72d94 Merge pull request #15434 from thatch45/ajacoutot-obsd-network 
Merge #15430
 2014-09-02 11:04:59 -06:00
Thomas S Hatch
6e139f0cec use correct spacing 2014-09-02 11:03:55 -06:00
Thomas S Hatch
78705f339c Merge branch 'obsd-network' of https://github.com/ajacoutot/salt into ajacoutot-obsd-network 2014-09-02 11:03:08 -06:00
Thomas S Hatch
0342964b5b Merge pull request #15426 from ajacoutot/obsd-postgres 
postgres: fix default "runas" value on OpenBSD
 2014-09-02 11:01:47 -06:00
Thomas S Hatch
1cdf5bb693 Merge pull request #15423 from nshalman/2014.7-zeromq-linking-breakage 
SmartOS esky: fix odd problem with zeromq linking
 2014-09-02 11:01:03 -06:00
Thomas S Hatch
718468241d Merge pull request #15433 from thatch45/nshalman-issue-14184 
merge #15422
 2014-09-02 11:00:37 -06:00
Thomas S Hatch
17653b9a57 Fix lint from #15422 
@nshalman, when you use strings they are loaded into memory, and if
a string is never referenced then it is just wasted ram, so these should
stay comments :)
 2014-09-02 10:58:50 -06:00
Thomas S Hatch
2392aa798c Merge branch 'issue-14184' of https://github.com/nshalman/salt into nshalman-issue-14184 2014-09-02 10:57:10 -06:00
Thomas S Hatch
7edae80cce Merge pull request #15431 from thatch45/ajacoutot-obsd-mount 
merge #15419
 2014-09-02 10:46:04 -06:00
Thomas S Hatch
1d282608f2 Fix lint for #15419 2014-09-02 10:44:48 -06:00
Thomas S Hatch
f134ed2ce6 Merge branch 'obsd-mount' of https://github.com/ajacoutot/salt into ajacoutot-obsd-mount 2014-09-02 10:43:45 -06:00
Colton Myers
36ef47e7a2 Merge branch '2014.7' into develop 
Conflicts:
	conf/minion
	salt/modules/mine.py
 2014-09-02 10:43:31 -06:00
Jonathan Frank
4525860cd7 Fixed lint issue with newly added code 2014-09-02 12:35:04 -04:00
Jonathan Frank
066d054780 Merge branch 'develop' of https://github.com/saltstack/salt into feature-ext_pillar-file_tree-nodegroups 2014-09-02 12:32:35 -04:00
Thomas S Hatch
af6f374db5 Merge pull request #15412 from ajacoutot/obsd-shadow-exp 
bsd_shadow: implement account and password expiration
 2014-09-02 09:46:26 -06:00
Thomas S Hatch
795ab71617 Merge pull request #15408 from sylphid8/target_pillar_from_ext_pillar 
add ability to target pillar from ext pillar
 2014-09-02 09:45:46 -06:00
Thomas S Hatch
4b828176f9 Merge pull request #15404 from rallytime/cloud_nightly_tests 
First pass at allowing jenkins.py to only run cloud tests
 2014-09-02 09:41:25 -06:00
Thomas S Hatch
81857ea074 Merge pull request #15403 from ajacoutot/obsd-rcctl 
openbsd_rcctl: improve performance of available() and missing()
 2014-09-02 09:38:37 -06:00
Thomas S Hatch
dd0d496a30 Merge pull request #15394 from mkotzev/develop 
Modified `docker.absent` to remove the container after stopping it.
 2014-09-02 09:37:55 -06:00
Gareth J. Greenaway
b154eda71d Checkout that kwargs exists in clear_load before attempting to pull out a kwarg. 2014-09-02 08:17:17 -07:00