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
77,322 Commits 24 Branches 182 Tags 341 MiB
cdbfb94cfe
Commit Graph

77322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Calmer
f30f5c8a25 fix unit tests 2017-05-19 13:28:52 +02:00
Tomas Zvala
011d6d65e7 Fix #41335 - list index out of range on empty line in authorized_keys 2017-05-19 10:53:05 +02:00
Michael Calmer
428baa9bce fix setting and getting locale on SUSE systems 
Also on with systems with systemd, SUSE still uses /etc/sysconfig/language
 2017-05-19 09:51:52 +02: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
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
Erik Johnson
edf552fe9a Update PKG_TARGETS for RHEL-based distros 2017-05-18 11:15:06 -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
Mike Place
26bd914580 Merge pull request #41316 from Ch3LL/update_latest_2016.3 
[2016.3] Bump latest release version to 2016.11.5
 2017-05-18 10:33:43 -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
520740d862
[2016.13] Bump latest release version to 2016.11.5 2017-05-18 09:40:08 -04:00
Ch3LL
cdb072c207
[2016.11] Bump latest release version to 2016.11.5 2017-05-18 09:39:04 -04: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
Mike Place
18898b7d1f Merge pull request #41216 from terminalmage/issue16592 
Make salt-cp work with larger files
 2017-05-17 14:26:41 -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
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
Piotr Kaźmierczak
d411a91676 Reverted back to cascading with statements for python 2.6 compat 2017-05-17 11:52:56 +02: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
Gareth J. Greenaway
5039fe12fb Removing chdir as it is no needed with this change 2017-05-16 15:04:07 -07: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
Piotr Kaźmierczak
7204013653 Compacted with statements in the unit test. 2017-05-16 22:48:09 +02: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
Bo Maryniuk
5168ef8959 Add unit test for hostname can be started from 127 2017-05-16 16:18:14 +02:00
Bo Maryniuk
0d0354198b Harden to 127. IP part 2017-05-16 16:17:26 +02:00
Bo Maryniuk
d9c8324a6b Unit test for accepting hosts names as 127 2017-05-16 12:07:32 +02:00
Bo Maryniuk
65b03c667b Bugfix: unable to use 127 as hostname 2017-05-16 12:06:51 +02:00
Erik Johnson
0ecc7b9b20 yumpkg: fix latest_version() when showdupesfromrepos=1 set in /etc/yum.conf 
The existing logic assumes that showdupesfromrepos=0, in which a package
will not be shown if it is not an upgrade. This expands the version
check to include versions equal to the installed version, which will
keep the _check_cur() helper from incorrectly reporting that an
already-installed version is an upgrade.
 2017-05-16 00:23:28 -05:00
Erik Johnson
d8e9676fcf Merge pull request #41181 from gtmanfred/2016.11 
add resolving extra flags to yum upgrade
 2017-05-15 23:07:46 -05:00
Nathan Fish
262d95e41d linux_syctl.default_config(): only return path, don't create it 
This function is now a safe, read-only function, that can be
called by states using test=True, for example.
 2017-05-15 15:19:49 -05:00
Nathan Fish
277232b3ac linux_sysctl.persist(): create config dir if needed 2017-05-15 15:18:30 -05:00
Daniel Wallace
2ca71713b1 use six and clean_kwargs 2017-05-15 12:23:58 -06:00
Daniel Wallace
c9bf09a5a1 add resolving extra flags to yum upgrade 2017-05-15 12:22:45 -06:00
Nicole Thomas
75942235f0 Merge pull request #41220 from rallytime/bp-40246 
Back-port #40246 to 2016.11
 2017-05-15 11:59:38 -06:00
Mike Place
53d5b3e816 Merge pull request #41244 from cachedout/fix_ipv6_nameserver_grains 
Fix ipv6 nameserver grains
 2017-05-15 12:55:38 -05:00
Mike Place
895fe582eb Merge pull request #41242 from M2Mobi/mysql_socket_auth 
Fix changing a mysql user to unix socket authentication.
 2017-05-15 12:00:06 -05:00
Mike Place
50d8fde123 Merge pull request #41101 from terminalmage/issue40940 
Fix "latest" keyword for version specification when used with aggregation
 2017-05-15 11:52:35 -05:00
Mike Place
f745db1a43
Lint 2017-05-15 09:21:38 -06:00
Mike Place
6e1ab69710
Partial revert of #40934 
This reverts most of #40934. The only thing that should have been fixed there was the spurious warning message.

The logic in calculating which nameserver grains is not correct. It merely overwrites what is returned by
salt.utils.dns.parse_resolv instead of choosing what to include.

As a result of that error, in the case where ipv6 is exempted, we don't string-ify the nameserver in the
list comprehension, which in term passes a non-parseable object to the msgpack serializer which results
in a totally broken minion.

I chose not to fix the logic in the block mentioned above because in doing so, we'd remove other items
from the dictionary which are already present which could break some users. We'll have to carefully evaluate
how to accomplish this going forward.
 2017-05-15 09:15:49 -06:00