valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,874 Commits 24 Branches 182 Tags 341 MiB
f0d46d04af
Commit Graph

76874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. R. Oldham
096f063464 Remove leftover conflict markers (oops! :-/ ) 2017-04-18 10:51:05 -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
Mike Place
f4f3ee69ba Merge pull request #40721 from gtmanfred/2016.3 
unset the bitwise instead of toggle
 2017-04-17 13:50:42 -06:00
rallytime
0a5e05a6e5 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-04-17 13:34:39 -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
Daniel Wallace
58b88859b3 unset the bitwise instead of toggle 2017-04-17 10:44:03 -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
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
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
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
Thor K. H
09145ea1a5 Fixes unindexed strfmt curly braces for python 2.6 2017-04-14 08:51:16 +01: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
Mike Place
ad4d6839fd Merge pull request #40675 from gtmanfred/2016.11 
use loader for getting war version
 2017-04-13 13:58:30 -06:00
Mike Place
7ea526f59e Merge pull request #40680 from rallytime/bp-40598 
Back-port #40598 to 2016.11
 2017-04-13 13:58:16 -06:00
twangboy
b6ac4aa86d Fix service for win10 update 2017-04-13 13:51:15 -06:00
Mike Place
db68df23dd Merge pull request #40681 from cachedout/status_beacon 
Allow status beacon to run on all operating systems
 2017-04-13 13:33:10 -06:00
Nicole Thomas
39dd6e284d Merge pull request #40678 from Ch3LL/fix_mac_fstype 
fix test_fstype test for mac
 2017-04-13 13:20:31 -06:00
Ch3LL
e30afc4c01
add exception type 2017-04-13 15:06:12 -04:00
Ch3LL
acf333df08
change errno code for fileclient test 2017-04-13 14:56:45 -04:00
Daniel Wallace
a61fc824c4 use loader for war extraction 
Also set the version added in the docs
 2017-04-13 11:51:22 -06:00
Mike Place
cc1643eb1f Fix netapi lint 2017-04-13 11:40:27 -06:00
Mike Place
ecbb0d186f
Allow status beacon to run on all operating systems 2017-04-13 10:32:25 -06:00
Christian McHugh
e790930f5a re-add batch support to cherrypy saltapi 2017-04-13 10:19:48 -06:00
Christian McHugh
6eec04b2db pop out of kwargs 2017-04-13 10:19:48 -06:00
Christian McHugh
260dd84758 Create eauth dict for passing into batch class 2017-04-13 10:19:48 -06:00
Christian McHugh
5fb8190d44 Ensure batch uses passed eauth token or credentials 2017-04-13 10:19:48 -06:00
Ch3LL
60724980ec
fix test_fstype test for mac 2017-04-13 12:04:20 -04:00
Mike Place
6df76f6687 Merge pull request #40665 from rallytime/bp-35665 
Back-port #35665 to 2016.11
 2017-04-12 15:06:36 -06:00
Mike Place
3e41a248a5 Merge pull request #40666 from gtmanfred/userdata 
make sure userdata is always defined in ec2
 2017-04-12 15:05:59 -06:00
Daniel Wallace
5e92fd0948 make sure userdata is always defined in ec2 2017-04-12 13:48:49 -06:00
Mike Place
b245abbea5 Merge pull request #40662 from twangboy/backport_msi_versioning 
Backport msi-conformant-version function
 2017-04-12 12:49:22 -06:00
Mike Place
92b5f03beb Merge pull request #40551 from terminalmage/issue39868 
Fix four issues in archive.extracted state
 2017-04-12 12:37:51 -06:00