valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,818 Commits 24 Branches 182 Tags 341 MiB
e14a48a0dc
Commit Graph

74818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
e14a48a0dc Merge pull request #37691 from twangboy/update_pyzmq_2016.11 
Update pyzmq to version 16.0.1 on 2016.11
 2016-11-15 16:07:50 +13:00
Mike Place
af6a1db2e2 Merge pull request #37682 from Ch3LL/fix_vbox_tests 
fix import for virtualbox test
 2016-11-15 15:55:57 +13:00
Mike Place
d1afbf05f7 Merge pull request #37687 from cachedout/issue_37468 
Revert "Be more careful about checking existence in thin creation"
 2016-11-15 13:54:58 +13:00
twangboy
08200d2ee8 Update pyzmq to version 16.0.1 2016-11-14 17:12:59 -07:00
Mike Place
0ee447354d
Revert "Be more careful about checking existence in thin creation" 
This reverts commit 00ec2b817c.

Closes #37468
 2016-11-15 12:28:49 +13:00
Ch3LL
acd4c3061e fix import for virtualbox test 2016-11-14 14:48:37 -07:00
Mike Place
0e38c4e622 Merge pull request #37636 from rajvidhimar/fix_commit_function 
Change the confirm parameter in commit function
 2016-11-12 21:14:48 +00:00
C. R. Oldham
7995f20dda Merge pull request #37652 from twangboy/fix_mac_power 
Fix set_restart_freeze function
 2016-11-11 16:04:05 -07:00
Mike Place
52dd60763d Merge pull request #37637 from rallytime/bp-37550 
Back-port #37550 to 2016.11
 2016-11-12 09:29:51 +13:00
Mike Place
182787e19d Merge pull request #37632 from twangboy/fix_versions_report 
Fix versions report for Windows Server platforms
 2016-11-12 09:22:43 +13:00
twangboy
df2ccc59fe Fix set_restart_freeze function 2016-11-11 12:50:11 -07:00
Tobias Macey
07c19a5e88 Addressing failures and inconsistency in parameter group handling 
The `describe_parameters` function in the boto_rds execution module was
using inconsistent return data depending on where in the function the
return was generated. There were also inappropriate uses of `bool` that
resulted in incorrect return values.

The `parameter_present` state was also incorrectly accessing invalid
keys in the return data from `describe_parameters`. Updated to properly
use the data returned to check for existence of parameters.
 2016-11-11 09:33:36 -07:00
Tobias Macey
7821bc89c7 Fixing check for parameter group 
The current implementation will return an invalid response if the
requested parameter group is not present. Added a check for the
parameter group not found error case and set the exists value in the
return to False.
 2016-11-11 09:33:36 -07:00
Tobias Macey
07e688dcff Fix parameter handling for boto_rds with boto3 
The way that optional parameters are handled forces some of them to be
defined even when that is not necessary. Updated handling to use a
mapping of snake_case to CamelCase names and only include defined
parameters in the call to boto for the `create` and `modify` actions.
 2016-11-11 09:33:36 -07:00
rajvidhimar
c20aab9738 Change the confirm parameter in commit function 2016-11-11 21:16:47 +05:30
twangboy
c4e36b3585 Fix some lint 2016-11-11 08:24:38 -07:00
Mike Place
737436a463 Merge pull request #37146 from cachedout/master_pub_error_reporting 
Master publish error reporting
 2016-11-11 22:52:31 +13:00
Mike Place
2c2dc93640
Fix test and check for jid not in pub_data 2016-11-11 15:37:47 +13:00
Mike Place
9d207c0224 Merge pull request #37607 from techhat/badstatusline 
Try the connection again, in case it's been reset
 2016-11-11 14:59:46 +13:00
Mike Place
9af5eb6ab8 Merge pull request #37624 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-11-11 14:51:10 +13:00
Mike Place
8e5610667f Merge pull request #37623 from cachedout/issue_37605 
Drop log warning level to debug
 2016-11-11 14:17:25 +13:00
twangboy
9a9effdfc7 Fix versions report for server OSs 2016-11-10 17:29:03 -07:00
rallytime
4c245a3fa5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/x509.py
 2016-11-10 16:51:52 -07:00
Mike Place
369653c08d
Drop log warning level to debug 
If we set this to info, it will appear on systems on every grains load. This affects
things like salt-call on every invocation. It's not sensible to throw this warning
in a CLI utility, especially on systems which may have a valid reason for being
configured in this manner. Either way, it shouldn't be the job of Salt to warn
people of this condition.

Refs #33934

Closes #37506
 2016-11-11 12:31:26 +13:00
Mike Place
9e253c9663 Disable pylint warning 2016-11-11 12:23:59 +13:00
Nicole Thomas
8ba9ceda50 Merge pull request #37609 from rallytime/merge-2016.11 
[2016.11] Merge forward from carbon to 2016.11
 2016-11-10 15:48:43 -07:00
Mike Place
a71e7c77b3 Merge pull request #37600 from mcalmer/fix-timezone-on-SUSE 
change TIMEZONE on SUSE systems (bsc#1008933)
 2016-11-11 10:54:04 +13:00
Mike Place
39b75878cf Merge pull request #37602 from DSRCorporation/bugs/37238_salt_hang_on_master_restart 
Handle master restart in appropriate places using `salt.event` listener.
 2016-11-11 10:53:20 +13:00
Mike Place
1b0f428116 Lint fix 2016-11-11 10:49:45 +13:00
Mike Place
019e1a721b Merge pull request #37608 from gtmanfred/2016.3 
allow multiline returns from docker for mac
 2016-11-11 10:48:59 +13:00
Nicole Thomas
7b00656d26 Merge pull request #18 from terminalmage/merge-2016.11 
Raise exception, and also fix error with call to str.format()
 2016-11-10 14:46:37 -07:00
Erik Johnson
3c51a67895 Raise exception, and also fix error with call to str.format() 2016-11-10 15:44:38 -06:00
Erik Johnson
71032f8da5 Documentation improvements and corrections (#37604) 
An earlier change (178ff08) introduced inaccurate information into the
documentation. This commit corrects that inaccuracy. It also adds some
clarifications to which SSH URL formats are supported, clarification
that the ``branch`` parameter refers to the local branch, and that
``user`` refers to the system user and not the http(s)/ssh auth user.
Lastly, some cleanup of improper RST formatting has been done.
 2016-11-10 14:12:48 -07:00
Nicole Thomas
9b71f3fa6d Merge pull request #17 from terminalmage/merge-2016.11 
Resolve merge conflict and integrate bugfix with 2016.11 branch
 2016-11-10 13:23:50 -07:00
Erik Johnson
39e5fc41c2 Resolve merge conflict and integrate bugfix with 2016.11 branch 2016-11-10 14:04:06 -06:00
Daniel Wallace
74aee1e372 allow multiline returns from docker for mac 
Nothing actually specifies the number of lines the docker api returns,
so we need to allow for more than one line to be returned which this
specfic docker returner does
 2016-11-10 13:08:44 -06:00
Joseph Hall
9e0f517985 Try the connection again, in case it's been reset 2016-11-10 12:00:08 -07:00
Nicole Thomas
eea781a9ac Update the docbuild settings for 2016.11 branch (#37606) 2016-11-10 10:47:25 -07:00
Nicole Thomas
06786f9617 Remove the v from the tag reference (#37595) 
When installing with pip, we just need the package version. No `v`.
 2016-11-10 09:41:34 -07:00
Aditya Kulkarni
a7e09f9260 Use existing VM's VDD size if not specified in the cloud profile (#37579) 2016-11-10 09:41:11 -07:00
Dmitry Kuzmenko
d3d987b19c Handle master restart in appropriate places using salt.event listener. 2016-11-10 18:07:09 +03:00
Michael Calmer
3530b542f0 change TIMEZONE on SUSE systems (bsc#1008933) 2016-11-10 11:00:50 +01:00
Mike Place
fdd13b4145 Merge pull request #37540 from yhekma/2016.3 
Added prefix to tempfile for template
 2016-11-10 13:37:17 +13:00
Mike Place
f7a20f5784 Merge pull request #37576 from DSRCorporation/features/37449_tls 
Basic SSL/TLS support in master-minion communication.
 2016-11-10 11:38:00 +13:00
Mike Place
6b0a29f6d6 Merge pull request #37589 from dmurphy18/fix_rpmbuild 
Update parameter for building with mock for rpms
 2016-11-10 11:09:48 +13:00
Clint Armstrong
5e80accd82 Update for m2crypto changes removing lhash (#37578) 
* Update for m2crypto changes removing lhash

* linting issues
 2016-11-09 13:47:26 -07:00
Clint Armstrong
928462df1d fix example of function argument limiting (#37584) 2016-11-09 13:37:18 -07:00
David Murphy
0e0ff2d374 Update parameter for building with mock for rpms 2016-11-09 13:16:56 -07:00
rallytime
f44e14b63c Merge branch 'carbon' into '2016.11' 
Conflicts:
  - salt/modules/file.py
 2016-11-09 12:56:58 -07:00
Erik Johnson
2810b85cac Add a test to ensure we don't check for fast-forward before fetching (#37571) 2016-11-09 12:43:25 -07:00