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
75,836 Commits 24 Branches 182 Tags 341 MiB
a782b00ee1
Commit Graph

75836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
fbc4d2a2c4 reactor: ensure glob_ref is a string 
When path does not exist, cp.cache_file returns False, which will cause
a traceback when we attempt to glob that path.
 2017-01-23 16:16:31 -06:00
Erik Johnson
2e443d79a3 cp.cache_file: add note re: return for nonexistant salt:// path 2017-01-23 16:16:31 -06:00
C. R. Oldham
0146562fb4 Call correct function for resetting a VM 2017-01-23 13:09:29 -07:00
David Boucha
c475609683 Proper function parameter default 
Change `protocol_version` default to `None` because `protocol_version`
is determined below and has the same default.

ZD #1159
 2017-01-23 13:05:38 -07:00
C. R. Oldham
76a9920a6b Call correct function for resetting a VM 2017-01-23 13:04:19 -07:00
Mike Place
41a3055213 Merge pull request #38885 from meaksh/2016.11-fix-tests-issues 
Increasing timeouts for running integrations tests
 2017-01-23 11:59:49 -07:00
Mike Place
bde6d3eee7 Merge pull request #38639 from isbm/isbm-disable-custom-roster-for-api-2016.11 
Isbm disable custom roster for api 2016.11
 2017-01-23 11:59:10 -07:00
Mike Place
c3fbfcd231 Merge pull request #38883 from techhat/dontrequire 
Don't require text_out path to exist
 2017-01-23 11:20:41 -07:00
Pablo Suárez Hernández
4311b0b6de Increasing timeouts for running integrations tests 2017-01-23 16:55:48 +00:00
Mike Place
6430a45196 Merge pull request #38851 from terminalmage/docker-py-2.0 
Support docker-py 2.0 in dockerng
 2017-01-23 09:48:11 -07:00
Joseph Hall
67bc4d6687 Don't require text_out path to exist 2017-01-23 09:47:54 -07:00
Mike Place
ec59ae67c8 Merge pull request #38859 from alxwr/2016.11 
fix parsing of sockstat -4
 2017-01-23 09:47:22 -07:00
Mike Place
5fe6db6201 Merge pull request #38850 from techhat/stripcache 
Strip .p from cache file names
 2017-01-23 09:28:45 -07:00
Alexander Weidinger
30fe5641c7 fix parsing of sockstat -4 2017-01-22 02:06:25 +01:00
Joseph Hall
109cb62e76 Remove .p from test 2017-01-20 20:22:57 -07:00
Megan Wilhite
2786e209c6 add 2016.11.2 changelog to release notes (#38848) 2017-01-20 15:32:45 -07:00
Erik Johnson
3c061b21fe Support docker-py 2.0 in dockerng 
docker-py 2.0 has renamed ``docker.Client()`` to ``docker.APIClient()``
 2017-01-20 16:31:45 -06:00
Joseph Hall
534aa3f527 Strip .p from cache file names 2017-01-20 15:27:09 -07:00
Erik Johnson
e40fac589a Catch MinionError in file.source_list 
Resolves #38825.
 2017-01-20 15:23:04 -06:00
Mike Place
ac8008d843 Merge pull request #38844 from cachedout/http_memory_leak 
Fix memory leak in HTTP client
 2017-01-20 13:59:13 -07:00
Mike Place
c46bf85518
Fix memory leak in HTTP client 
Credit to Damien Vandenbossche and Thomas Lemarchand @tlemarchand for discovery and fix.
 2017-01-20 13:57:28 -07:00
Mike Place
4913c4f90c Merge pull request #38819 from twangboy/salt_perms_2016.11 
Remove `Users` from c:\salt [DO NOT MERGE FORWARD]
 2017-01-20 13:17:35 -07:00
Mike Place
dfe6dfe963 Merge pull request #38823 from gtmanfred/2016.3 
pass pillar to compound matcher in match module
 2017-01-20 12:19:09 -07:00
Nicole Thomas
a275b9714e Merge pull request #38815 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-20 11:53:00 -07:00
Mike Place
efe1bf10e8 Merge pull request #38832 from terminalmage/issue38711 
archive.extracted: Identify symlinks when checking for incorrect types
 2017-01-20 11:36:14 -07:00
rallytime
ce6d1b103d Make sure we're using the opts dict mocking in parsers_test 
The additional call to parser.parse_args(args) negates the first
patch to running self.config_func. We want the opts that we set
up in the above test to patch the setup args when the parse_args
func is called. This updates the mock to work with better with
patch and removes the additional parser.parse_args call.
 2017-01-20 10:20:51 -07:00
Erik Johnson
d10c068e25 Update archive state unit tests to reflect symlinks in archive.list 2017-01-20 08:49:40 -06:00
Mike Place
a04ab86da1 Merge pull request #38833 from Ch3LL/add_release_notes_2016.3.5 
add 2016.3.5 changelog to release notes
 2017-01-19 16:27:25 -07:00
Ch3LL
374dc1ab88 skip 2016.3.5 due to :doc: references 2017-01-19 16:14:22 -07:00
Ch3LL
31f324c4ff add 2016.3.5 changelog to release notes 2017-01-19 15:43:28 -07:00
Erik Johnson
d6adfb6d12 Identify symlinks when looking for incorrect types 
Also, enforce ownership properly on both files and symlinks
 2017-01-19 15:49:55 -06:00
Mike Place
10a3d8b8dd Merge pull request #38726 from twangboy/vcredist 
Add VC Redist 2008 SP1 MFC to installer
 2017-01-19 12:13:41 -07:00
Erik Johnson
09b9e95f7c archive.list: organize symlinks separately from files in verbose mode 
Also fix an incorrect method for identifying symlinks
 2017-01-19 11:03:04 -06:00
Erik Johnson
e6483f096d Support removing symlinks in salt.utils.rm_rf 2017-01-19 10:47:43 -06:00
Daniel Wallace
f0a71e8707 pass pillar to compound matcher in match module 2017-01-19 08:45:50 -06:00
twangboy
eb04ed7eef Remove User from c:\salt 2017-01-18 17:32:55 -07:00
Mike Place
d5f2d92a4e Merge pull request #38810 from UtahDave/fix_beacon_doc_zd1035 
Fix beacon doc
 2017-01-18 14:37:20 -07:00
rallytime
315b2c8712 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/win_system.py
  - tests/unit/modules/win_system_test.py
 2017-01-18 14:16:45 -07:00
Mike Place
88faf08a71 Merge pull request #38811 from techhat/sanvm 
Show a lot less data when requesting a VM
 2017-01-18 14:08:02 -07:00
Mike Place
d14f0c64eb Merge pull request #38812 from rallytime/pyobjects-test 
Update pyobjects test to be a list
 2017-01-18 14:06:00 -07:00
Mike Place
50f03f8057 Merge pull request #38813 from gtmanfred/2016.3 
catch SIGPIPE in vmware connection
 2017-01-18 14:05:41 -07:00
Daniel Wallace
ce3472cec2 catch SIGPIPE in vmware connection 2017-01-18 13:58:04 -06:00
Mike Place
23b8b47258 Merge pull request #38809 from twangboy/fix_hostname_2016.3 
Fix get_hostname to handle longer computer names
 2017-01-18 12:31:59 -07:00
rallytime
f3e84c1ab7 Update pyobjects test to be a list 
Refs the discussion in https://github.com/saltstack/salt/issues/21796#issuecomment-84454088
 2017-01-18 12:16:30 -07:00
Joseph Hall
47c19325cf Show a lot less data when requesting a VM 2017-01-18 12:13:23 -07:00
David Boucha
dbe9edb806 fix reactor example. 
This version is tested on 2016.11 branch and was found working
ZD 1035
 2017-01-18 11:46:34 -07:00
twangboy
d57a51f9f9 Fix tests for get_hostname 2017-01-18 11:27:50 -07:00
Mike Place
1033bbdde8 Merge pull request #38808 from vutny/fix-38388 
Fix #38388
 2017-01-18 11:19:35 -07:00
twangboy
7ca3fd7484 Fix get_hostname to handle longer computer names 2017-01-18 11:19:22 -07:00
Megan Wilhite
a8a6215663 refine the os detection in archive test (#38807) 2017-01-18 11:03:55 -07:00