valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
80,844 Commits 24 Branches 182 Tags 341 MiB
bad421be66
Commit Graph

80844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
bad421be66 Update managed.sls test file: osmajorrelease grain is an int now 
We need to make the comparison in the file to `7` instead of `'7'`,
otherwise the state doesn't execute correctly and the test_pkgrepo
test will fail because the state didn't run.
 2017-04-20 12:27:45 -06:00
Mike Place
68542f7aec Merge pull request #40768 from twangboy/fix_win_lgpo 
Fix _build_parent_list function for Py3
 2017-04-20 11:15:39 -06:00
Nicole Thomas
99048b1792 Merge pull request #40757 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-19 11:48:16 -06:00
twangboy
9a5671adf8 Fix _build_parent_list function for Py3 2017-04-19 10:36:31 -06:00
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-04-18 16:42:30 -06:00
Mike Place
f4c9da2da0 Merge pull request #40733 from rallytime/fix-40435 
Change file data to bytes before attempting to hash
 2017-04-18 14:07:41 -06:00
Mike Place
3557b5140e Merge pull request #40735 from rallytime/handle-cloud-traces 
Handle stacktraces in cloud.action function in module and runner
 2017-04-18 14:05:06 -06:00
Mike Place
e700d8183b Merge pull request #40745 from cro/vmware_disk_datastore_bp 
Backport `Add support for specifying a datastore for new disks.` PR #36457
 2017-04-18 14:00:50 -06:00
Mike Place
78dbab01dc Merge pull request #40740 from cro/minion_delay_start 
Backport pr #39802 to add random_startup_delay
 2017-04-18 13:47:55 -06:00
C. R. Oldham
1460f82ce4 Remove leftover conflict markers (oops! :-/ ) 2017-04-18 10:57:39 -06:00
C. R. Oldham
b26be652dd Remove leftover conflict markers (oops! :-/ ) 2017-04-18 10:56:09 -06:00
C. R. Oldham
096f063464 Remove leftover conflict markers (oops! :-/ ) 2017-04-18 10:51:05 -06:00
Nicole Thomas
d0b90058c4 Merge pull request #40706 from twangboy/fix_whitelist 
Remove non-existent tests from whitelist
 2017-04-18 10:30:55 -06:00
C. R. Oldham
d24078d1a0 Add docs for "datastore" param for disks 2017-04-18 09:33:46 -06:00
C. R. Oldham
500d6b281d Document validity of a datastore key inside a disk definition. 2017-04-18 09:33:46 -06:00
C. R. Oldham
7608b10225 Add support for specifying a datastore for new disks. 2017-04-18 09:33:46 -06:00
Mike Place
2ab95b7dd5 Set minion test to use default opts 2017-04-18 08:34:57 -06:00
Mike Place
785e6060a9 Add requested docs 2017-04-18 08:34:56 -06:00
Mike Place
8ab321f934 A random startup delay option for minions 
This allows minions to spread out the load to the master if a large number
of them start up at once.
 2017-04-18 08:34:56 -06:00
rallytime
87154a95a4 Use log.error instead of log.err 2017-04-17 16:29:03 -06:00
rallytime
b35bf919a3 Handle stacktraces in cloud.action function in module and runner 
Refs #29602
 2017-04-17 15:58:30 -06:00
Nicole Thomas
a48ecc4a5c Merge pull request #40728 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-17 15:13:15 -06:00
Nicole Thomas
894dc96db3 Merge pull request #40727 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-17 15:12:47 -06:00
rallytime
ef09971b9e Change file data to bytes before attempting to hash 2017-04-17 15:01:51 -06:00
twangboy
e4876abcde Add back the two loader tests 2017-04-17 14:04:20 -06:00
rallytime
0a5e05a6e5 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-04-17 13:34:39 -06:00
rallytime
292f55600b Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/fileserver/s3fs.py
  - tests/unit/test_fileclient.py
 2017-04-17 13:32:56 -06:00
Nicole Thomas
bf8bb0fde6 Merge pull request #40719 from rallytime/bp-40714 
Back-port #40714 to 2016.3
 2017-04-17 13:27:24 -06:00
Mike Place
c5cbfc2e63 Merge pull request #40707 from gtmanfred/2016.11 
Use markers when s3 bucket list is truncated
 2017-04-17 10:45:20 -06:00
Nicole Thomas
4145d33e46 Merge pull request #40718 from terminalmage/fix-docstring 
Fix copypasta in the pw_user docstring
 2017-04-17 09:36:51 -06:00
Ben Woods
d6c436246b Make salt.modules.pw_user.get_loginclass return string rather than dict 
This aligns with salt.modules.useradd.get_loginclass which is used
for OpenBSD.

This fixes salt.modules.pw_user.chloginclass which is used for FreeBSD
and expects a string to be returned. This was therefore returning False
even after successfully changing the loginclass.

This also fixes salt.states.user.present on FreeBSD when loginclass is
set.
 2017-04-17 09:22:43 -06:00
Nicole Thomas
06a4cf84fd Merge pull request #40701 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-17 09:19:10 -06:00
Erik Johnson
14e8b85da5 Fix copypasta in the pw_user docstring 
The pw_user module uses the pw command, not useradd
 2017-04-17 09:43:38 -05:00
Nicole Thomas
e5cd6086a7 Merge pull request #40708 from Ch3LL/2016.11.4_release 
Add 2016.11.4 Release Note ChangeLog
 2017-04-14 16:12:56 -06:00
Ch3LL
d228fb6e02
Add 2016.11.4 Release Note ChangeLog 2017-04-14 17:17:03 -04:00
Daniel Wallace
1932f7265d Use markers when s3 bucket list is truncated 
Fixes #36967
 2017-04-14 14:35:47 -06:00
twangboy
9d7f78e896 Remove non-existent tests from whitelist 2017-04-14 14:35:06 -06:00
Nicole Thomas
77028a6c4e Merge pull request #40685 from Ch3LL/fix_mac_file 
Fix errno code for filecache test for other operating systems.
 2017-04-14 10:54:25 -06:00
rallytime
f552dd63f3 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - pkg/windows/installer/Salt-Minion-Setup.nsi
  - tests/unit/states/test_tomcat.py
 2017-04-14 10:46:56 -06:00
Mike Place
bc70772f9d Merge pull request #40689 from jbadson/fix-syslog-returner 
Fixes bug that prevents syslog returner from working under Python 2.6
 2017-04-14 04:45:12 -06:00
Mike Place
983d35ad38 Merge pull request #40690 from thor/2016.11-tomcat 
Fixes #40658: even clearer and working(!) Tomcat version handling
 2017-04-14 04:44:01 -06:00
Mike Place
6b2e6b0da2 Merge pull request #40692 from twangboy/fix_cmdmod_py3 
Change method of getting system drive letter
 2017-04-14 04:24:41 -06:00
Thor K. H
09145ea1a5 Fixes unindexed strfmt curly braces for python 2.6 2017-04-14 08:51:16 +01:00
twangboy
f15de66350 Change method of getting system drive letter 2017-04-13 17:43:13 -06:00
Nicole Thomas
5569798d2a Merge pull request #40679 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-13 16:19:09 -06:00
Ch3LL
9ea6e8b456
remove io and change to EROFS 2017-04-13 18:10:44 -04:00
Thor K. H
b78fc46b91 Fixes #40658: clearer version handling 
A few minor improvements/fixes to the clarity of version handling from
both the states view, and the module.

Firstly, the main culprit: the module's check for the passed version
parameter was too strict, and would only work when the version was
explicitly True. This would never work for a string.
This has been changed to simply check if it's "true"-ish: if no
parameter is passed, the default is True, and it'll try to guess a
version number. If you pass a specific version, then it'll use that.

Should you pass False, or an empty string, it'll be viewed as blank,
which was the initial intent. It's not that *that* didn't work, it's
just that the other part didn't, which means no version at all did.
*cough*

Besides that, it's a bit clearer with different default named parameter
values for 'version', that doesn't otherwise change the behaviour in any
reasonable backwards way. A blank version for a Tomcat version is
nonsensical, per Apache's documentation.
https://tomcat.apache.org/tomcat-8.0-doc/config/context.html#Naming

Otherwise, it's all minor with an actual type checker before sending it
along in the module.

Plus, there was a minor mistake in the documentation for the state.
 2017-04-13 23:06:20 +01:00
Jim Adson
e5a3a7d217 Fixes bug that prevents syslog returner from working under Python 2.6 
Fixes #40688
 2017-04-13 15:33:54 -06:00
Ch3LL
688791ff60
remove try-except and change errno 2017-04-13 17:06:44 -04:00
Mike Place
3cd9a50b22 Merge pull request #40686 from twangboy/fix_service 
Fix 'salt-minion' service for Win 10 Creators Update 1703
 2017-04-13 14:00:12 -06:00