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,560 Commits 24 Branches 182 Tags 341 MiB
ec8ef53d56
Commit Graph

76560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arthur Wikström
ec8ef53d56 Properly quote .app files containing spaces 2016-12-14 10:48:45 +01:00
Nicole Thomas
aca6a1f266 Merge pull request #38237 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-12-13 17:00:55 -07:00
rallytime
fe1e24909e Merge branch '2016.11' into 'develop' 
No conflicts.
 2016-12-13 11:29:16 -07:00
Nicole Thomas
ba62fcf2ec Merge pull request #38234 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-13 11:28:02 -07:00
rallytime
6a327d1367 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-12-13 10:19:47 -07:00
Mike Place
004e46afe7 Merge pull request #38198 from vutny/unit-tests-require-libcloud-boto3 
Add missing requirements for running unit tests: libcloud and boto3
 2016-12-13 07:12:20 -07:00
Mike Place
9d497bc74c Merge pull request #38213 from rallytime/skip-tls-test 
Skip test_cert_info tls unit test on pyOpenSSL upstream errors
 2016-12-13 05:05:01 -07:00
Mike Place
0e1ffbc210 Merge pull request #38214 from rallytime/fix-35502 
Remove Nitrogen deprecations in the glance module
 2016-12-13 05:03:38 -07:00
Mike Place
203109dd17 Merge pull request #38224 from whiteinge/cors-options-unauthed 
Allow CORS OPTIONS requests to be unauthenticated
 2016-12-13 05:02:30 -07:00
Denys Havrysh
a6098bac1a Remove note about SaltTesting installation, now it is in the requirements 2016-12-13 11:38:35 +02:00
Mike Place
721a5feccd Merge pull request #38223 from whiteinge/salt-api-root_dirs 
Add root_dir to salt-api file paths
 2016-12-13 00:44:19 -07:00
Mike Place
8f5c6e5df9 Merge pull request #38180 from alexbleotu/vsphere_decorators-gh 
Vsphere decorators gh
 2016-12-13 00:43:51 -07:00
Seth House
de4d3227ab Allow CORS OPTIONS requests to be unauthenticated 2016-12-12 22:56:30 -07:00
Seth House
bfbf390c0e Add root_dir to salt-api file paths 2016-12-12 21:30:54 -07:00
rallytime
7393fe8894 Pylint fix 2016-12-12 16:12:21 -07:00
rallytime
a839e84d02 Remove Nitrogen deprecations in the glance module 
There are warnings in here to keep things in place for Beryllium,
and we have bumped the warnings each feature release until Nitrogen.

It's time to remove the code, as we haven't heard back in some time
from the original code deprecation author.

Fixes #35502
 2016-12-12 14:59:58 -07:00
rallytime
bdb807fc7c Skip test_cert_info tls unit test on pyOpenSSL upstream errors 
The 16.0.0 version of pyOpenSSL has an upstream error in it that
causes a stacktrace in our test suite. The upstream issue has
been fixed in pyOpenSSL in 16.1.0 and upwards, but 16.0.0 is still
available.

This fix skips the test when the specific error generated by the
upstream bug is encountered during the test.
 2016-12-12 14:21:41 -07:00
Nicole Thomas
8b304ee271 Merge pull request #38208 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-12-12 13:36:39 -07:00
rallytime
29f45c192c Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/ec2.py
  - salt/modules/grains.py
 2016-12-12 11:23:57 -07:00
Nicole Thomas
7ead1ed336 Merge pull request #38205 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-12-12 11:13:18 -07:00
Nicole Thomas
669409d681 Merge pull request #38203 from rallytime/bp-38188 
Back-port #38188 to 2016.11
 2016-12-12 10:48:51 -07:00
rallytime
e31f97cf71 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-12-12 10:08:27 -07:00
Nicole Thomas
604205c61e Merge pull request #38193 from conradjones/develop 
Added support for vsphere customization specs.
 2016-12-12 09:43:56 -07:00
Andreas Tsaridas
50d3200b12 removing not needed join 2016-12-12 09:21:37 -07:00
Andreas Tsaridas
7af708e1e7 fix for push_dir in different OS 2016-12-12 09:21:36 -07:00
Mike Place
0202596185 Merge pull request #38188 from tsaridas/push_dir 
fix for push_dir in different OS
 2016-12-12 06:43:15 -07:00
Mike Place
44f2737cbc Merge pull request #38179 from alexbleotu/get_hosts-gh 
Get hosts gh
 2016-12-12 05:21:09 -07:00
Denys Havrysh
004bff113e Add missing requirements for running unit tests: libcloud and boto3 2016-12-12 13:18:38 +02:00
Alexandru Bleotu
ded7ff9adb Fixed pylint 2016-12-12 05:56:13 -05:00
Alexandru Bleotu
b2f9d1eb4b Reraise sys.exc_info with six.reraise to be PY3 compatible 2016-12-12 05:52:52 -05:00
Alexandru Bleotu
9314e4ab62 Fixed newly introduced pylint errors 2016-12-12 05:29:39 -05:00
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
Andreas Tsaridas
55f72afa7c removing not needed join 2016-12-10 14:55:28 +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