valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,431 Commits 24 Branches 182 Tags 341 MiB
c6c1d30c48
Commit Graph

81431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
c6c1d30c48 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/yumpkg.py
  - salt/spm/__init__.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/utils/test_network.py
 2017-05-20 17:07:34 -06:00
Mike Place
5bc2727d01 Merge pull request #41193 from cro/digicert_n 
Digicert integration
 2017-05-19 13:56:38 -05:00
Mike Place
29bd7f48b7 Merge pull request #41287 from garethgreenaway/40748_2016_11_consul 
Fix to consul cache
 2017-05-19 13:32:55 -05:00
Mike Place
672aaa88d3 Merge pull request #41309 from garethgreenaway/38894_allowing_test_argument 
Adding test argument for runners & wheel orchestration modules
 2017-05-19 13:26:08 -05:00
Mike Place
140b0427e1 Merge pull request #41319 from lomeroe/bp_41307 
backport #41307 to 2016.11, properly pack version numbers into single
 2017-05-19 13:24:59 -05:00
Mike Place
6bdb7cca7d Merge pull request #41327 from Ch3LL/add_2016.11.6_release 
Add 2016.11.6 Release Notes
 2017-05-19 13:05:08 -05:00
Mike Place
1faffd3932 Merge pull request #41329 from lorengordon/doc-fix 
Corrects versionadded for win_network.get_route
 2017-05-19 12:47:56 -05:00
Mike Place
db109a3707 Merge pull request #40911 from twangboy/win_snmp_unicode 
win_snmp: Improve unicode support on Py2
 2017-05-19 10:41:17 -05:00
Mike Place
6ca65592da Merge pull request #41322 from Ch3LL/fix_release_2016.11.5_notes 
Add patched packages warning to 2016.11.5 release notes
 2017-05-18 16:53:25 -05:00
Loren Gordon
3c471247f0 Corrects versionadded for win_network.get_route 2017-05-18 16:18:34 -04:00
Ch3LL
e5fc0aeb9c
Add 2016.11.6 Release Notes 2017-05-18 14:17:35 -04:00
Mike Place
cac6cce922 Merge pull request #41308 from terminalmage/py3-tests 
Don't overwrite environment in pip tests
 2017-05-18 12:01:46 -05:00
Ch3LL
9a1bf4205f
fix url refs in rst 2017-05-18 12:42:35 -04:00
Ch3LL
cde008ff77
Add patched packages warning to 2016.11.5 release notes 2017-05-18 12:24:53 -04:00
Mike Place
d29f363ed8 Merge pull request #41300 from loverend/add_ipv6_napalm_engine 
napalm_syslog engine: Add check for IPv6 address for zmq socket
 2017-05-18 11:10:42 -05:00
Mike Place
9f359d841f Merge pull request #41208 from pkazmierczak/pkazmierczak-zypper-multiple-ver-pkgs 
Fix: zypper handling of multiple version packages
 2017-05-18 10:44:26 -05:00
Mike Place
bcef99adb6 Merge pull request #41317 from Ch3LL/update_latest_2016.11 
[2016.11] Bump latest release version to 2016.11.5
 2017-05-18 10:34:12 -05:00
lomeroe
4f0aa577a5 backport 41307 to 2016.11, properly pack version numbers into single 
number
 2017-05-18 09:37:53 -05:00
Ch3LL
cdb072c207
[2016.11] Bump latest release version to 2016.11.5 2017-05-18 09:39:04 -04:00
Luke Overend
8c5595ad09 napalm_syslog engine: Add check for IPv6 address for zmq socket 
When opening a zmq socket it is assumed that the address is IPv4, to
enable IPv6 you have to explicitly declare so. This adds a simple check
for an IPv6 address by checking for the presence of `:` in the address,
then enabled IPv6 on the socket.
 2017-05-18 10:47:05 +01:00
Gareth J. Greenaway
e1a88e8bf7 Allowing test=True to be passed for salt.runner and salt.wheel when used with orchestration 2017-05-17 14:06:23 -07:00
Erik Johnson
acc5f14bae Don't overwrite environment in pip tests 
Potentially fixes https://github.com/saltstack/salt-jenkins/issues/340
 2017-05-17 15:12:35 -05:00
Mike Place
051259d469 Merge pull request #41218 from gtmanfred/roster 
allow for syncing salt-ssh rosters on the master
 2017-05-17 14:21:25 -05:00
Mike Place
ab76fc65b4 Merge pull request #41219 from rallytime/bump-module-state-deprecation 
Bump removal version from Oxygen to Flourine for module.run state
 2017-05-17 14:11:02 -05:00
Mike Place
b8ddd7ee08 Merge pull request #41232 from axmetishe/2016.11 
Add basic auth for SPM
 2017-05-17 14:08:56 -05:00
Mike Place
7bdb66d969 Merge pull request #41236 from BenoitKnecht/2016.11 
states: cron: show correct changes when using `special`
 2017-05-17 13:51:57 -05:00
Mike Place
1c1e092f56 Merge pull request #41269 from isbm/isbm-minion-id-127-name 
Bugfix: Unable to use "127" as hostname for the Minion ID
 2017-05-17 13:31:15 -05:00
Mike Place
fe38c7cf5e Merge pull request #41282 from mcdermj/bp-41247 
JunOS: Change os_install to use get_file instead of get_template
 2017-05-17 13:25:26 -05:00
Mike Place
d0fa31d4ca Merge pull request #41289 from garethgreenaway/2016_11_5_fix_consul_cache_ls 
Fixing consul cache
 2017-05-17 11:54:11 -05:00
Mike Place
6566648948 Merge pull request #41303 from lomeroe/bp-41301 
backport #41301 -- properly convert packed string to decimal values
 2017-05-17 11:32:21 -05:00
lomeroe
f4b93f9d9a properly convert packed string to decimal values 2017-05-17 10:28:17 -05:00
Nicole Thomas
c2377cd2d0 Merge pull request #41293 from terminalmage/py3-tests 
Python 3 test fixes + better pip/virtualenv detection.
 2017-05-17 09:13:06 -06:00
Piotr Kaźmierczak
d411a91676 Reverted back to cascading with statements for python 2.6 compat 2017-05-17 11:52:56 +02:00
Nicole Thomas
5e24e6ad86 Merge pull request #41258 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-16 19:56:58 -06:00
Gareth J. Greenaway
780a28c9a0 Swapping the order in the func_alias so the ls function is available. 2017-05-16 15:40:41 -07:00
Mike Place
0a22df3252 Merge pull request #41275 from cloudflare/px_keepalive_opt 
Adding keepalive optional arg for NAPALM always alive minions
 2017-05-16 17:35:51 -05:00
Gareth J. Greenaway
5039fe12fb Removing chdir as it is no needed with this change 2017-05-16 15:04:07 -07:00
rallytime
76714d116b Mock calls to salt.utils.pkg.clear_rtag call in aptpkg unit tests 2017-05-16 16:00:37 -06:00
rallytime
8e1db7c427 Pylint fix 2017-05-16 15:53:11 -06:00
Erik Johnson
4827444ae2 Fix virtualenv detection 
Look for virtualenv-X.Y, then virtualenvX, then virtualenv, where X and
Y are the major and minor versions, respectively.
 2017-05-16 16:53:00 -05:00
Erik Johnson
e7455fad69 Additional fix for pip detection 
Ubuntu 17.04 distributes a pip3 executable, but not a pip3.5. So, this
changes the pip detection so that it looks for a pipX after pipX.Y.
 2017-05-16 16:47:39 -05:00
Gareth J. Greenaway
4550c3ce49 Updating the code that is pulling in the list of cached minions to use self.cache.list instead of relying on checking the local file system, which only works for the localfs cache method. #40748 2017-05-16 14:41:15 -07:00
Nicole Thomas
52d62efa33 Merge pull request #41262 from rallytime/minor-doc-fixes 
Fix a couple of doc references for code-block highlighting
 2017-05-16 15:24:45 -06:00
Piotr Kaźmierczak
7204013653 Compacted with statements in the unit test. 2017-05-16 22:48:09 +02:00
Erik Johnson
b7cc420e6f decode to string before trying to load JSON 2017-05-16 14:20:05 -05:00
Piotr Kaźmierczak
6c4c08042c Added unit tests and copied the behavior to 
.upgrade method, too.
 2017-05-16 20:47:04 +02:00
Erik Johnson
44598617be Merge pull request #41283 from terminalmage/bp-41251 
Backport #41251 to 2016.11
 2017-05-16 13:01:17 -05:00
abednarik
ed03ca534f Update apt module regarding upgrade against hold packages. 
Fixes #41231 and related to #30777.
 2017-05-16 13:00:05 -05:00
Jeremy McDermond
3e481cb764 JunOS: Fix whitespace for PEP compliance 2017-05-16 10:00:58 -07:00
Jeremy McDermond
f1751d135a JunOS: Fix Unit Test 
When adding the cp.get_file function, we need to add it into the list of
mock functions in the unit test along with get_template or the unit
tests will fail.
 2017-05-16 10:00:50 -07:00