Commit Graph

58667 Commits

Author SHA1 Message Date
Thomas Jackson
d55ea7550b Add body to salt.utils.http.query returns
This way we have a consistent return method that some interal callers (fileclient) who don't care about the decoding of the message can just use.

Fixes #28477
2015-11-04 08:26:19 -08:00
Mike Place
4c8cd064a4 Merge pull request #28417 from rallytime/azure-version-warning
Add note about azure sdk version to getting started docs
2015-10-29 13:47:05 -06:00
rallytime
8e3a2ba7e7 Add note about azure sdk version to getting started docs 2015-10-29 15:30:37 -04:00
Mike Place
7ead823731 Merge pull request #28410 from jacksontj/2015.8
Add retries to the zeromq.AsyncReqMessageClient
2015-10-29 12:05:50 -06:00
Mike Place
50845a1e91 Merge pull request #28404 from rallytime/bp-28395
Back-port #28395 to 2015.8
2015-10-29 10:09:20 -06:00
Thomas Jackson
70b5ae9b1d Add retries to the zeromq.AsyncReqMessageClient
Fixes #28392
2015-10-29 09:00:02 -07:00
Mike Place
e746b564b4 Merge pull request #28405 from Unity-Technologies/hotfix/choco-version-detect
Detect legacy versions of chocolatey correctly
2015-10-29 09:57:30 -06:00
Mike Place
4304001a8f Merge pull request #28187 from sjansen/patch-1
fix at.present
2015-10-29 09:49:18 -06:00
Mike Place
5efac26c10 Merge pull request #28375 from Precis/fix-pillar-include-loop
Merge pillar includes correctly
2015-10-29 09:12:48 -06:00
Mike Place
a69b124aaa Merge pull request #28376 from lyft/multivalue-route53-values-2015.8
Support update of route53 records with multiple values
2015-10-29 08:54:47 -06:00
Daniel Hobley
0076d73872 Make sure we exit out correctly when checking for choco version 2015-10-29 15:50:15 +01:00
Mike Place
9e5a510e73 Merge pull request #28377 from terminalmage/force-pkgbuild
Deprecate 'always' in favor of 'force' in pkgbuild.built
2015-10-29 08:42:22 -06:00
Daniel Hobley
157e0f446d Detect legacy versions of chocolatey correctly
- This commit makes sure to detect both newer and legacy versions of chocolatey before giving up
2015-10-29 15:36:47 +01:00
rallytime
badcb677e9 Use correct version release number 2015-10-29 10:33:03 -04:00
Christer Edwards
c5c66b8bab Updating bsd_shadow to match mainline shadow
- added del_password method; merged from shadow
 - addresses #28382
2015-10-29 10:32:02 -04:00
Nicole Thomas
cd632f798d Merge pull request #28380 from cro/sshprox_fix
Add missing call for service provider
2015-10-29 10:26:55 -04:00
Matthias Erll
f8e2c26473 Variable err is from previous loop, too. 2015-10-29 07:27:03 +01:00
C. R. Oldham
7bcc275dce Lint + logic error. 2015-10-28 16:51:02 -06:00
C. R. Oldham
92d712a54b Add a missing call for the service provider 2015-10-28 15:30:42 -06:00
Erik Johnson
f18305e19e Add versionadded directive 2015-10-28 15:17:45 -06:00
Erik Johnson
7046d0d896 Deprecate 'always' in favor of 'force' in pkgbuild.built
"force" is the common usage in salt, this change will make things a bit
more consistent.
2015-10-28 15:06:35 -06:00
Ryan Lane
cd221515a1 Support update of route53 records with multiple values
Backport from #28374
2015-10-28 14:04:25 -07:00
Mike Place
e7571e6d61 Merge pull request #28348 from jfindlay/alias
salt.utils.alias informs user they are using a renamed function
2015-10-28 14:46:36 -06:00
Mike Place
072eb98a26 Merge pull request #28364 from jtand/blockdev_test_fix
In CentOS 5 the .split() causes a stacktrace.
2015-10-28 14:46:02 -06:00
Matthias Erll
042314246f Unit test for merging included pillars. 2015-10-28 21:45:26 +01:00
Mike Place
06b928cfdb Merge pull request #28361 from rallytime/bp-28087
Back-port #28087 to 2015.8
2015-10-28 14:44:32 -06:00
Mike Place
d9e5fba9b5 Merge pull request #28360 from multani/fix/docs
Various documentation fixes
2015-10-28 14:43:20 -06:00
Mike Place
4157c8331b Merge pull request #28370 from rallytime/bp-28276
Back-port #28276 to 2015.8
2015-10-28 14:37:49 -06:00
Matthias Erll
a42c51f9bf Do not merge previous values in pillar include loop. 2015-10-28 20:56:37 +01:00
Thayne Harbaugh
227ddbcb24 Simplify setting success when there are no pkg updates. 2015-10-28 15:38:36 -04:00
Thayne Harbaugh
cd58165138 Correct state pkg.updtodate to succeed when packages are up-to-date
When there are no packages to upgrade pkg.upgrade returns an empty dictionary
indicating that there were no changes - this should result in state
pkg.uptodate succeeding.
2015-10-28 15:38:36 -04:00
Justin Findlay
7915d7e5e8 use alias util to formally alias module functions
Fixes #28202.
2015-10-28 13:06:09 -06:00
Justin Findlay
6a8b61bd12 create function alias to improve api documentation 2015-10-28 12:33:16 -06:00
justinta89
3b4d03ff1a In CentOS 5 the .split() causes a stacktrace. Confirmed.split() appears to be unneeded in other OSs. 2015-10-28 11:48:39 -06:00
Dmitry Kuzmenko
41536e55b9 Revert "Update __init__.py"
This reverts commit 5664de6610.

The commit introduced a specific implementation of WheelClient.cmd()
that calls low(fun, low) method passing args as low argument that's
wrong, args and kwargs should be packed into low that should be a dict.
2015-10-28 13:15:13 -04:00
Mike Place
3942b4d0e6 Merge pull request #28353 from Precis/fix-pillar-sls-matches
Consider each pillar match only once.
2015-10-28 09:05:20 -06:00
Mike Place
0d8bea6c43 Merge pull request #28334 from alprs/fix-iptables_comment
iptables needs -m comment for --comment to work
2015-10-28 08:24:52 -06:00
Mike Place
7000b6ee8f Merge pull request #28340 from jfindlay/decode_client
sdecode file and dir lists in fileclient
2015-10-28 08:23:10 -06:00
Mike Place
48448c9a48 Merge pull request #28344 from lyft/fix-iptables-non-filter
Fix iptables state for non-filter tables
2015-10-28 08:21:54 -06:00
Nicole Thomas
72f0c106cf Merge pull request #28343 from rallytime/bp-28342
Back-port #28342 to 2015.8
2015-10-28 09:58:27 -04:00
Matthias Erll
2f3f2d6f29 Consider each pillar match only once. 2015-10-28 13:56:44 +01:00
Ryan Lane
21ba070b3d Fix iptables state for non-filter tables 2015-10-27 14:10:46 -07:00
Forrest Alvarez
03d15dd090 Fix up a dup doc entry. 2015-10-27 16:19:49 -04:00
Justin Findlay
bd9151b5e3 sdecode file and dir lists in fileclient
Fixes #27789.
2015-10-27 13:56:16 -06:00
Andreas Lutro
170ea7c50d iptables needs -m comment for --comment to work 2015-10-27 18:20:37 +01:00
Mike Place
64d5c2362a Merge pull request #28330 from rallytime/bp-28305
Back-port #28305 to 2015.8
2015-10-27 11:20:35 -06:00
Erik Johnson
a44c8d8dab Merge pull request #28270 from rallytime/refactor_rabbitmq_plugin_state
Refactor RabbitMQ Plugin State to correctly use test=true and format errors
2015-10-27 11:18:34 -06:00
Erik Johnson
4efd07eba5 Merge pull request #28269 from rallytime/refactor_rabbitmq_user_state
Refactor rabbitmq_user state to use test=True correctly
2015-10-27 11:17:42 -06:00
Roy Williams
a46dbcb62b Fix Cabal states.
`cabal.update` was not inheriting the environment from the call to
`cabal.installed`, which causes cabal to fail when doing things like
specifying a home directory.
2015-10-27 10:37:02 -04:00
rallytime
9e40c3a6a6 Fine tuning and fix tests 2015-10-27 10:30:00 -04:00