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
76,743 Commits 24 Branches 182 Tags 341 MiB
662d8d64a8
Commit Graph

76743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
717288adeb Merge pull request #38190 from whiteinge/serializer-docs 
Fix incorrect file.serialize docs; all serializer modules are supported
 2016-12-12 02:46:40 -07:00
Mike Place
70f7d22ad6 Merge pull request #38191 from terminalmage/issue38162 
Clarify the fact that git_pillar.update does not fast-forward
 2016-12-12 02:45:48 -07:00
Mike Place
b12cff151e Add blank line for lint compliance 2016-12-12 02:44:56 -07:00
Mike Place
28171cbfc5 Merge pull request #38194 from vutny/integration-test-requirements-doc 
Document the requirements for running ZeroMQ-based integration tests
 2016-12-12 02:42:11 -07:00
Conrad Jones
3574f6e2f5 Added support for vsphere customization specs. 2016-12-11 09:28:37 +00:00
Denys Havrysh
e9f419ff64 Document the requirements for running ZeroMQ-based integration tests 2016-12-10 22:16:18 +02:00
Super-User
528c20ba4b zonecfg.info - parser would not handle certain SmartOS specific bits, also parse value type to int/bool/str 2016-12-10 15:40:51 +01:00
Andreas Tsaridas
55f72afa7c removing not needed join 2016-12-10 14:55:28 +01:00
Super-User
527ac30dac zonecfg.info - dump parsed output of zone configuration 2016-12-10 14:23:02 +01:00
Erik Johnson
1ae543a98a Clarify the fact that git_pillar.update does not fast-forward 2016-12-09 22:52:12 -06:00
Seth House
1b5d7e4362 Fix incorrect file.serialize docs; all serializer modules are supported 2016-12-09 17:40:04 -07:00
Andreas Tsaridas
bbadac329c add doc for master config (#38189) 
* add doc for master config

* changes requested
 2016-12-09 17:23:06 -07:00
Megan Wilhite
f7294dc85b add 2016.11.1 changelog to release notes (#38186) 2016-12-09 15:44:09 -07:00
Andreas Tsaridas
4384ee65a5 fix for push_dir in different OS 2016-12-09 23:29:40 +01:00
Nicole Thomas
a4ef037ab1 Merge pull request #38185 from rallytime/bp-38181 
Back-port #38181 to 2016.3
 2016-12-09 15:27:44 -07:00
Nicole Thomas
23c039347e Merge pull request #38182 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-09 14:25:47 -07:00
Mike Place
8355adc535 Merge pull request #38158 from cachedout/issue_38094 
Fix type problem in grains.filter_by
 2016-12-09 14:24:40 -07:00
Mike Place
31a157d902 Merge pull request #38156 from terminalmage/fix-windows-refresh 
Remove rtag when windows minion refreshes early in state
 2016-12-09 14:15:01 -07:00
Mike Place
c638952684 Merge pull request #38183 from cro/fix_37891 
Fix bad set operations when setting up securitygroups in AWS.
 2016-12-09 14:12:10 -07:00
rallytime
609f814454 Reset socket default timeout to None (fixes daemons_tests failures) 
Also removed skipIf logic when on Python 2.6. This fix resolves the
same test failures on 2.6 as well as Ubuntu 12 (which is apparently
running Pyhton 2.7 on our test images from Linode these days).
 2016-12-09 13:50:48 -07:00
Nicole Thomas
fc95045ba1 Reset socket default timeout to None (fixes daemons_tests failures) (#38181) 
Also removed skipIf logic when on Python 2.6. This fix resolves the
same test failures on 2.6 as well as Ubuntu 12 (which is apparently
running Pyhton 2.7 on our test images from Linode these days).
 2016-12-09 13:49:44 -07:00
C. R. Oldham
0527d6f25e Fix bad set operations when setting up securitygroups in AWS. Fixes #37891. 2016-12-09 12:23:33 -07:00
Mike Place
31180a4733 Merge pull request #38119 from sypets/documentation-requisites-overview-table 
documentation: added overview (table) of requisites to requisites doc
 2016-12-09 11:51:36 -07:00
Mike Place
27a4ca5c6f Merge pull request #38124 from danielmorlock/develop 
Fixes #38097: Make the Gentoo version of pkg.latest_version return a …
 2016-12-09 11:50:51 -07:00
Mike Place
7ccbedd2cc Merge pull request #38148 from whiteinge/no-ssh-async-client 
Remove ssh_async from NetapiClient clients; it is not implemented
 2016-12-09 11:49:41 -07:00
rallytime
627242ab5d Merge branch '2016.3' into '2016.11' 
Conflicts:
  - tests/unit/config/config_test.py
 2016-12-09 11:45:14 -07:00
Mike Place
e8196e23c2
Lint, remove set literal 2016-12-09 11:37:44 -07:00
Mike Place
8d4e194400 Merge pull request #38160 from terminalmage/update-archive-docs 
Update information about xz-utils in archive state/module docs
 2016-12-09 11:34:03 -07:00
Mike Place
65b2ad7b14 Merge pull request #38163 from Ch3LL/enabled_ec2_cloud 
enabled ec2 cloud tests
 2016-12-09 11:01:57 -07:00
Mike Place
05136f0d8c Merge pull request #38164 from techhat/azuredocs 
Add Azure ARM docs for 2016.11.0
 2016-12-09 11:00:22 -07:00
Mike Place
48c491df4c Merge pull request #38165 from lomeroe/in_range_inclusive_reg_sz_fix 
have _in_range_inclusive function attempt to convert a string to an i…
 2016-12-09 10:59:32 -07:00
Mike Place
aeea1a852e Merge pull request #38168 from skizunov/develop2 
Add support for a multi-func job using same func more than once
 2016-12-09 10:34:48 -07:00
Alexandru Bleotu
366075654f Fixed small bug in _get_proxy_connection_details 2016-12-09 12:10:10 -05:00
Alexandru Bleotu
bef16be61d Removed unnecessary call to salt.modules.vsphere._get_proxy_target from test 2016-12-09 11:58:00 -05:00
Mike Place
e3c858cc28 Merge pull request #38173 from rallytime/update-win-deprecation-versions 
Bump some win* module deprecations from Nitrogen to Oxygen
 2016-12-09 09:57:29 -07:00
Mike Place
b63f74e034 Merge pull request #38177 from vutny/fix-cp-get-file-str 
Correct `cp.get_file_str` docstring and add integration tests
 2016-12-09 09:55:35 -07:00
Alexandru Bleotu
7b0f6df8d8 Fixed test with new get_cluster call 2016-12-09 11:55:20 -05:00
Alexandru Bleotu
38b3ebf434 Fix pylint errors in tests for utils.vmware.get_hosts 2016-12-09 11:53:27 -05:00
Alexandru Bleotu
d99abac1d4 Fixed pylint error in utils.vmware.get_hosts 2016-12-09 11:53:22 -05:00
Alexandru Bleotu
398b5b11de Fixed get_cluster call 2016-12-09 11:52:09 -05:00
Alexandru Bleotu
0ea033d21d Added tests for utils.vmware.get_hosts 2016-12-09 10:04:24 -05:00
Alexandru Bleotu
27d393344a Added utils.vmware.get_hosts 
- returns a list of vim.HostSystem objects representing ESXi hosts in a
  vCenter filtered by their names and/or datacenter, cluster membership.
 2016-12-09 10:04:17 -05:00
Daniel Morlock
958ebec9e2 Fix PEP8 violations 2016-12-09 15:14:39 +01:00
Alexandru Bleotu
a7f250b7a0 Added tests for modules.vsphere.test_vcenter_connection 2016-12-09 07:55:44 -05:00
Alexandru Bleotu
5737dd0c15 Added modules.vsphere.test_vcenter_connection 
- checks if a connection is to a vCenter
 2016-12-09 07:55:44 -05:00
Alexandru Bleotu
cd47cf754c Added tests for modules.vsphere.gets_service_instance_via_proxy decorator 2016-12-09 07:55:44 -05:00
Alexandru Bleotu
ddb5de1c12 Added modules.vsphere.gets_service_instance_via_proxy decorator 
- decorator that connects to a target system (vCenter or ESXi host)
  using the proxy details and passes the connection (vim.ServiceInstance)
  to the decorated function.
- the decorated function needs to have a parameter called
  service_instance
 2016-12-09 07:55:43 -05:00
Alexandru Bleotu
f94ead0ad3 Added tests for modules.vsphere.supports_proxies decorator 2016-12-09 07:55:43 -05:00
Alexandru Bleotu
59a8ae7f2d Added modules.vsphere.supports_proxies decorator 
- decorator to specify which proxy types are supported by a function
 2016-12-09 07:55:43 -05:00
Alexandru Bleotu
c9e70743d3 Added tests for modules.vsphere._get_proxy_connection_details 2016-12-09 07:55:43 -05:00