valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
56,908 Commits 24 Branches 182 Tags 341 MiB
2fee5708bb
Commit Graph

56908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
2fee5708bb Merge pull request #26501 from terminalmage/git_pillar_docs 
Update git_pillar docs, add git.list_worktrees function
 2015-08-20 23:34:02 -06:00
Erik Johnson
cca92412d8 Use salt.utils.fopen() instead of open() 2015-08-20 18:51:44 -05:00
Justin Findlay
80110387c7 Merge pull request #26521 from terminalmage/issue15519 
Work around upstream git bug when cloning repo as root
 2015-08-20 17:32:16 -06:00
Justin Findlay
73183cbdb4 Merge pull request #26518 from krak3n/fix/25492 
Fix for #25492
 2015-08-20 17:28:34 -06:00
Justin Findlay
e2c43916d2 Merge pull request #26514 from evverx/unmask-runtime-masked-services 
Unmask a runtime masked services too
 2015-08-20 17:27:07 -06:00
Justin Findlay
dfd8c457bd Merge pull request #26529 from mnalt/fix_freebsdservice_module_for_missing_rcconf 
bugfix: fix service.enable for missing rc.conf
 2015-08-20 16:53:08 -06:00
Mike Place
dd1bfa821b Merge pull request #26516 from techhat/spmloader2 
Move more path operations into SPM loader
 2015-08-20 16:15:20 -06:00
Joseph Hall
aead0ac432 Fix references 2015-08-20 15:47:34 -06:00
Mike Place
854491c9f3 Merge pull request #26533 from cachedout/fix_event_socket 
Fix too aggressive even init check
 2015-08-20 15:29:07 -06:00
Jenkins
b44ab40e26 Fix too aggressive even init check 2015-08-20 15:28:44 -06:00
Shane Lee
20fddf40a1 Merge pull request #26522 from cro/proxy_should_not_load 
Do not load package provider if its not a proxy
 2015-08-20 14:43:21 -06:00
Mike Place
6048b1351d Merge pull request #26531 from cachedout/event_test_fix 
Fix failing event tests and modify event init
 2015-08-20 14:38:36 -06:00
Jenkins
f5131c2b46 More indent 2015-08-20 13:57:36 -06:00
Jenkins
729ca11333 Indent error 2015-08-20 13:54:16 -06:00
Jenkins
52cde47aaf Fix failing event tests and modify event init 
There was a problem wherein two sockets would race to see which was connected first,
causing unit.utils.event_test.TestSaltEvent.test_event_multiple_clients to fail from
time to time. This gives a little breathing room to the second socket.

This also only does the pub connect if necessary on SaltEvent instantation.
 2015-08-20 13:41:07 -06:00
Martin Alt
a6b5007161 bugfix: fix service.enable for missing rc.conf 
The code assumed rc.conf to be existing and non-empty. Added a length
check to ensure it works even if rc.conf is missing, such as in a newly
created jail.
 2015-08-20 21:04:15 +02: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
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
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
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
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
Evgeny Vereshchagin
184801db19 Unmask a runtime masked services too 2015-08-20 14:23:09 +00:00
Nitin Madhok
dca4d601d5 Adding ability to specify the virtual hardware version when creating VM 2015-08-19 21:17:22 -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
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
C. R. Oldham
aace656a37 Fix bad url. 2015-08-19 16:38:30 -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
rallytime
56ee889038 Whitespace fix 2015-08-19 15:45:19 -06:00
Justin Findlay
01de0b8c69 Merge pull request #26485 from s0undt3ch/2015.8 
One more missed typo
 2015-08-19 15:15:18 -06:00
Mike Place
ef79125316 Merge pull request #26495 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-19 14:48:36 -06:00
Colton Myers
9cd7ec32bf Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-08-19 14:47:07 -06:00
Mike Place
4fff53b842 Merge pull request #26494 from cachedout/remove_debug_statements 
Remove unecessary debug statements
 2015-08-19 14:46:00 -06:00
Jenkins
d717a43dcc Remove unecessary debug statements 
These were throwing errors on some platforms:

Traceback (most recent call last):
  File "/testing/tests/unit/modules/random_org_test.py", line 296, in test_generateblobs
    format='hex'), ret6)
  File "/testing/salt/modules/random_org.py", line 743, in generateBlobs
    result = _query(api_version=api_version, data=data)
  File "/testing/salt/modules/random_org.py", line 125, in _query
    log.debug('result {0}'.format(result.text))
AttributeError: 'dict' object has no attribute 'text'
 2015-08-19 14:44:16 -06:00
rallytime
7fd19777f5 Make sure cloud maps don't ignore terminated instances in EC2 2015-08-19 14:41:53 -06:00
Mike Place
49eebec30a Merge pull request #26492 from cachedout/fix_schedule_test_26 
Fix schedule test error on py26
 2015-08-19 14:36:40 -06:00
Jenkins
9d3f0624b4 Lint 2015-08-19 14:36:23 -06:00
Jenkins
5b7389d80e Fix schedule test error on py26 2015-08-19 14:33:38 -06:00
Jacob Hammons
2a85d71c25 doc site css fix for tiny fonts that appeared in code or pre tags in headings 2015-08-19 14:32:55 -06:00