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
58,136 Commits 24 Branches 182 Tags 341 MiB
eff874de1a
Commit Graph

58136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Rosenbaum
d8cc71dbd8 fix some docstring typos 2015-08-20 10:35:20 -07:00
C. R. Oldham
e2c70ac55d Merge pull request #26433 from cro/pm_20158_2 
Add support for default proxy config options, change default location of proxy config and log to /etc/salt/proxy and /var/log/proxy
 2015-08-20 11:14:13 -06:00
Justin Findlay
612e342c70 autogenerated 2015.5.5 release notes 2015-08-20 11:08:56 -06:00
Nicole Thomas
ade934f06e Merge pull request #26504 from nmadhok/vmware-hardware-version-2015.8 
[Backport] Adding ability to specify the virtual hardware version when creating VM
 2015-08-20 10:55:40 -06:00
Trần Tuấn Anh
30c9923d38 fix E1321 2015-08-20 23:52:10 +07:00
C. R. Oldham
789defae5b Make sure virtual package provider does not load for non-proxies 2015-08-20 10:30:17 -06:00
Erik Johnson
8319743660 Work around upstream git bug when cloning repo as root 
See https://github.com/saltstack/salt/issues/15519#issuecomment-128531310
 2015-08-20 11:07:37 -05:00
Colton Myers
c390e812d8 Merge pull request #26435 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-08-20 10:05:53 -06:00
Colton Myers
28aa9b1058 Merge pull request #26486 from thusoy/git-confidential-auth 
Git: Don't leak https user/pw to log
 2015-08-20 10:04:52 -06:00
Justin Findlay
6fd1ed8c42 Merge pull request #26508 from jodv/public_hash_function 
Make arbitrary hash function access public
 2015-08-20 09:53:44 -06:00
Trần Tuấn Anh
c555ef7de9 add urlparse 2015-08-20 22:44:49 +07:00
Erik Johnson
9a87f052d5 Update class name for old git pillar class 2015-08-20 10:39:36 -05:00
Chris Reeves
dc45384ff1 Fix for #25492 2015-08-20 16:12:22 +01:00
Mike Place
682b5ee4f3 Merge pull request #26517 from cachedout/opensuse_fix_2 
Better fix for opensuse tornado httpclient
 2015-08-20 09:10:45 -06:00
Jenkins
e8c9ffef7e Better fix for opensuse tornado httpclient 2015-08-20 09:09:58 -06:00
Joseph Hall
8b7981ed76 Move more path operations into SPM loader 2015-08-20 09:00:41 -06:00
Ageeleshwar Kandavelu
8723754dfa pylint fixes 2015-08-20 20:24:15 +05:30
Joseph Hall
fe3d0e8dc5 Merge pull request #26479 from rallytime/ec2_force_rename 
Don't allow VMs with duplicate names to be created in EC2/AWS
 2015-08-20 08:36:39 -06:00
Ageeleshwar Kandavelu
62af0d7f07 Merge from upstream 
Merge branch 'develop' of github.com:saltstack/salt into develop
 2015-08-20 20:06:01 +05:30
Joseph Hall
44fbd49b33 Merge pull request #26503 from nmadhok/vmware-hardware-version-develop 
VMware cloud driver - Adding ability to specify the virtual hardware version when creating VM
 2015-08-20 08:35:46 -06:00
Ageeleshwar Kandavelu
b2ec235199 ini cosmetics fix 2015-08-20 20:05:36 +05:30
Evgeny Vereshchagin
184801db19 Unmask a runtime masked services too 2015-08-20 14:23:09 +00:00
Trần Tuấn Anh
d005321e85 add comment 2015-08-20 19:42:53 +07:00
Trần Tuấn Anh
4045c70d84 fix raven's version bug 2015-08-20 18:04:39 +07:00
Chris Fane
e00a98fd37 Adds support for nested upstart scripts in the form of subfolder/service. This is implemented via an os.walk through the /etc/init folder, rather than the previous glob for *.conf method. 
Fixes #26478 - nested upstart services are not supported
 2015-08-20 10:59:20 +01:00
Jeremy Rosenbaum
7a04a8dc1e Make arbitrary hash function access public 
While the normal splay functionality to spread job execution times across minions
uses the minion ID as the hash function key, I've found other use cases where I
want access to a consistent hashing algorithm in execution modules but I don't
necessarily want the minion ID to be the key.  This is just a minor change to
allow public access to the previously hidden function that allows that.
 2015-08-19 23:59:56 -07:00
Tarjei Husøy
5289165487 Git: Don't leak https user/pw to log 2015-08-19 23:58:08 -07:00
Nitin Madhok
dca4d601d5 Adding ability to specify the virtual hardware version when creating VM 2015-08-19 21:17:22 -04:00
Nitin Madhok
702b55f2ca Adding ability to specify the virtual hardware version when creating VM 2015-08-19 21:05:12 -04:00
Erik Johnson
817078096f Fix invalid :py:func: paths 
These are functions from the execution module, not the state module.
 2015-08-19 19:10:17 -05:00
Erik Johnson
43fef21907 Add list_worktrees tests 2015-08-19 19:09:59 -05:00
Erik Johnson
4c87aedb9c 2 fixes, one new function in git execution module 
1. Allow rev=None in git.rev_parse
2. When an error is raised by _git_run, join the "command" list to make
   the error message easier to read

Added list_worktrees function.
 2015-08-19 19:06:42 -05:00
Erik Johnson
b4773e8d07 Use raw string for regex 2015-08-19 19:05:45 -05:00
Erik Johnson
57f0cfa648 Fix reference to old LegacyGitPillar class 2015-08-19 19:05:08 -05:00
Mike Place
103651d963 Merge pull request #26488 from cachedout/fix_unsupported_tornado_kwarg 
Don't pass unsupported kwarg to tornado
 2015-08-19 16:54:47 -06:00
Mike Place
da464a6dbe Merge pull request #26451 from terminalmage/issue26338 
Use 'rpm -qa' instead of repoquery to list installed packages
 2015-08-19 16:53:54 -06:00
Mike Place
679ba5ee0a Merge pull request #26476 from jacobhammons/doc-bugs 
Minor doc bug fixes
 2015-08-19 16:52:34 -06:00
Mike Place
42b8c1b3f4 Merge pull request #26443 from cachedout/fix_event_sub 
Fix connect issue in event init
 2015-08-19 16:50:22 -06:00
Mike Place
d2df1a86ad Merge pull request #26445 from cachedout/issue_26343 
Raise clean error when no minions targeted in batch mode
 2015-08-19 16:50:07 -06:00
Mike Place
0cf9f11aa5 Merge pull request #26458 from arthurlogilab/minion_proxy_fixes 
[minionproxy] example modules fixes
 2015-08-19 16:49:49 -06:00
Mike Place
97aea928c4 Merge pull request #26466 from s0undt3ch/hotfix/py3-FileNotFoundError-exception 
Py3 compatibility. Address KeyError.
 2015-08-19 16:48:32 -06:00
Mike Place
a9b28e9577 Merge pull request #26483 from thusoy/git-user-only-auth 
Handle user-only http auth in git module
 2015-08-19 16:47:41 -06:00
Mike Place
fee4a7bb04 Merge pull request #26491 from jacobhammons/css-fix 
doc site css fix for tiny fonts that appeared in code or pre tags in …
 2015-08-19 16:46:44 -06:00
Mike Place
edc04930ae Merge pull request #26496 from jfindlay/dateutil 
add dateutil dependency reporting
 2015-08-19 16:46:31 -06:00
Nicole Thomas
3b0c01d2c9 Merge pull request #26468 from TheBigBear/patch-11 
Suggested rewording to satisfy issue #26403
 2015-08-19 16:46:15 -06:00
Colton Myers
8d450b9acd Remove unused import 2015-08-19 16:38:34 -06:00
C. R. Oldham
aace656a37 Fix bad url. 2015-08-19 16:38:30 -06:00
Colton Myers
04fa77032c Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/linode.py
 2015-08-19 16:37:39 -06:00
C. R. Oldham
e47f4df6f8 Merge pull request #26442 from rallytime/hide_api_key 
Hide API Key from debug logs for Linode Driver
 2015-08-19 16:30:28 -06:00
C. R. Oldham
d2d47ad553 Merge pull request #26441 from rallytime/linode_improvements 
Refactor a few linode functions to be useful with salt-cloud command
 2015-08-19 16:29:20 -06:00