Steve Groesz
8a84b3b963
add kernelversion grain for Win
2017-04-19 17:44:00 -05:00
Steve Groesz
80f178223c
implement kernelversion grain
2017-04-19 17:26:57 -05:00
Mike Place
c406d3de0d
Merge pull request #40773 from mchugh19/patch-2
...
Update msteams.py
2017-04-19 14:50:14 -06:00
Christian McHugh
0f43b2b871
Update msteams.py
...
Correct color handling
2017-04-19 20:10:18 +01:00
Mike Place
9f261b35ec
Merge pull request #40758 from rallytime/merge-develop
...
[develop] Merge forward from nitrogen to develop
2017-04-19 10:59:55 -06:00
Nicole Thomas
f0fb6d3965
Merge pull request #40760 from jf/fix_consul_pillar_doc_writeup
...
Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'!
2017-04-19 09:20:31 -06:00
Jeffrey 'jf' Lim
f45c276775
Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'!
2017-04-19 10:44:18 +08:00
rallytime
0616405104
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-18 16:43:11 -06:00
Mike Place
408699ac54
Merge pull request #40730 from ecdavis/boto_iam-delete-virtual-mfa-device
...
Change boto_iam.user_absent state to delete IAM user's virtual MFA device after deactivation.
2017-04-18 14:44:35 -06:00
Mike Place
421d7be152
Merge pull request #40731 from basepi/sync_fileservers
...
Add fileserver syncing
2017-04-18 14:19:15 -06:00
Mike Place
471a16cdc0
Merge pull request #40732 from basepi/config.get
...
Add config runner (config.get for master settings)
2017-04-18 14:12:34 -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
6c8410e7be
Merge pull request #40747 from markuskramerIgitt/variables_naming
...
variable names more speaking
2017-04-18 13:41:57 -06:00
Nicole Thomas
ec32073e9d
Merge pull request #40736 from ecdavis/boto_lambda-use-__utils__
...
Change boto_lambda module to use __utils__ instead of salt.utils to allow overriding modules
2017-04-18 13:37:06 -06:00
Evan Davis
8d634ef389
fix test failures
2017-04-18 11:02:27 -07: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
Evan Davis
2d6b62207e
fix typo
2017-04-17 16:23:14 -07:00
Evan Davis
a1c8dacecc
switch boto_lambda module from using salt.utils to __utils__
2017-04-17 16:21:57 -07:00
Nicole Thomas
92c655b94d
Merge pull request #40729 from ecdavis/boto_lambda-botocore-error-message
...
Fix error message in boto_lambda module which incorrectly referenced boto_apigateway module.
2017-04-17 16:46:14 -06:00
Nicole Thomas
c712e916d2
Merge pull request #40722 from markuskramerIgitt/fix_typo
...
fix typo
2017-04-17 15:15:38 -06:00
Nicole Thomas
ea92c4fb4f
Merge pull request #40725 from rallytime/merge-develop
...
[develop] Merge forward from nitrogen to develop
2017-04-17 15:13:40 -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
Colton Myers
8812341b70
Add sdb support, and also properly return the default
2017-04-17 14:57:46 -06:00
Colton Myers
8a9d4c7f4f
Add more cli examples
2017-04-17 14:47:11 -06:00
Colton Myers
5e8f92ef70
Add config.get runner function
2017-04-17 14:41:42 -06:00
Colton Myers
57e92f6fa5
Add fileserver syncing
2017-04-17 14:30:06 -06:00
twangboy
e4876abcde
Add back the two loader tests
2017-04-17 14:04:20 -06:00
Evan Davis
1ace66bce7
when deactivating a user's mfa device, try to delete the virtual mfa devices with the same serial number
2017-04-17 12:58:48 -07:00
Evan Davis
ea488927a5
add delete_virtual_mfa_device function to boto_iam module to expose boto3 iam client's delete_virtual_mfa_device method
2017-04-17 12:57:43 -07:00
Evan Davis
675a72facb
fix error message in boto_lambda module which referenced boto_apigateway module
2017-04-17 12:46:20 -07: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
rallytime
885419b3e7
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-17 13:27:58 -06:00
markuskramerIgitt
96cfe15248
variable names more speaking
2017-04-17 20:52:02 +02:00
markuskramerIgitt
60be2ce99d
fix typo
2017-04-17 20:43:58 +02:00
Mike Place
f7b062acd7
Merge pull request #40266 from meaksh/develop-pkg-improvements
...
[develop] Adding "pkg.downloaded" state and support for installing patches/erratas
2017-04-17 11:34:42 -06:00
Mike Place
a7b507377b
Merge pull request #40704 from xetus-oss/boto-ec2-add-private-ip-management-states
...
Adds test mode for private_ips_present and private_ips_absent
2017-04-17 11:12:46 -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
d6d7562602
Merge pull request #40702 from rallytime/merge-develop
...
[develop] Merge forward from nitrogen to develop
2017-04-17 09:19:30 -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
5ad02f7c19
Merge pull request #40714 from woodsb02/patch-1
...
Make salt.modules.pw_user.get_loginclass return string rather than dict
2017-04-17 09:47:28 -05:00
Pablo Suárez Hernández
fa9e7f01f7
Pylint fix
2017-04-17 14:18:09 +01:00
Pablo Suárez Hernández
40422ecd02
Adding more unit tests for Zypper module
2017-04-17 13:06:35 +01:00
Pablo Suárez Hernández
5701e90803
Adding unit tests for Zypper execution module
2017-04-17 13:02:08 +01:00
Pablo Suárez Hernández
fa0f4e2c2b
Some refactoring and minor fixes
2017-04-17 10:40:43 +01:00
Pablo Suárez Hernández
257a3c48a5
Adding versionadded flags
2017-04-17 09:22:32 +01:00
Ben Woods
7c151fb527
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 12:29:37 +08: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
