Nicole Thomas
55913a51ce
Merge pull request #44615 from rallytime/44602-develop
...
[develop] Move PR #44602 forward to develop
2017-11-21 17:09:17 -05:00
Nicole Thomas
4f30e845ee
Merge pull request #44614 from rallytime/44602-2017.7
...
[2017.7] Move PR #44602 forward to 2017.7
2017-11-21 16:21:05 -05:00
Nicole Thomas
b18ebd1db8
Merge branch 'develop' into 44602-develop
2017-11-21 13:58:42 -05:00
rallytime
628f015c1b
Move TimoutError check lower down in exception list
...
When called as a one-liner, the "else None" causes the following error:
TypeError: catching classes that do not inherit from BaseException is not allowed
2017-11-21 13:16:42 -05:00
Ch3LL
359a59dd64
Add salt-key -d integration test
2017-11-21 10:40:25 -05:00
rallytime
669d03ec33
Move TimoutError check lower down in exception list
...
When called as a one-liner, the "else None" causes the following error:
TypeError: catching classes that do not inherit from BaseException is not allowed
2017-11-21 10:21:47 -05:00
Erik Johnson
2cdf0f4dff
Fix traceback in new iSCSI IQN grains
...
Using a simple str.find here means that any comments with InitiatorName
in them would cause a traceback. This fixes the logic used to parse the
IQN out of the file.
This also removes a lot of needless creation of new lists just to use
list.extend(), in favor of using list.append().
2017-11-21 08:43:58 -06:00
Volodymyr Samodid
d0cf146858
fix for #44595
...
** Overwrite output plugin for all client and runner instances in
lxc salt-cloud driver
2017-11-21 14:29:09 +02:00
Ch3LL
74ededafa7
Add ssh thin_dir integration test
2017-11-20 17:37:38 -05:00
Nicole Thomas
3c24edd6a5
Merge pull request #44605 from campbellmc/develop
...
Add handling for FreeBSD in timezone.zone_compare
2017-11-20 16:56:53 -05:00
Ch3LL
c9ba33432e
Add Non Base Environement salt:// source integration test
2017-11-20 16:53:56 -05:00
rallytime
477c3caa77
Handle timeout_monitor/TimeoutError issues for new versions of CherryPy
...
Fixes #44601
2017-11-20 16:51:42 -05:00
rallytime
d26d9ff5e4
Handle timeout_monitor/TimeoutError issues for new versions of CherryPy
...
Fixes #44601
2017-11-20 16:45:34 -05:00
Gareth J. Greenaway
227be73e0a
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-20 11:01:38 -08:00
Mike Place
136b9e3bc4
Merge pull request #44571 from rallytime/bp-43822
...
Back-port #43822 to 2017.7
2017-11-20 19:01:25 +00:00
Campbell
0bcbeb0c6e
Merge branch 'develop' into develop
2017-11-20 18:53:57 +00:00
Mike Place
446e3436c2
Merge pull request #44573 from garethgreenaway/requisite_without_module_name
...
Adding the ability to specify requisites without a state module name
2017-11-20 18:50:13 +00:00
Mike Place
bed858e5cb
Merge pull request #44592 from skjaro/ipset-add-new-options
...
ipset add new options
2017-11-20 18:44:39 +00:00
Mike Place
bea7f65291
Merge pull request #44588 from rallytime/logging-in-virtual-funcs
...
Add documentation about logging before modules are loaded
2017-11-20 18:43:18 +00:00
Mike Place
264460f55f
Merge pull request #44598 from roaldnefs/add-telegram-module
...
Added new Telegram module
2017-11-20 18:41:31 +00:00
Mike Place
56f0584e01
Merge pull request #44603 from oarmstrong/develop
...
Fix acme state to correctly return on test
2017-11-20 18:23:06 +00:00
Mike Place
f2a00ea3fc
Correct indentation
2017-11-20 11:16:43 -07:00
campbell
e2f11a0d2b
Add handling for FreeBSD in method zone_compare to avoid exception when /etc/localtime file does is absent. This is valid configuration on FreeBSD and represents UTC.
2017-11-20 16:50:20 +00:00
Nicole Thomas
a8044b73c3
Merge pull request #44513 from rallytime/bp-44472
...
Back-port #44472 to 2017.7
2017-11-20 11:09:01 -05:00
Ollie Armstrong
f11d408389
Fix acme state to correctly return on test
...
Previously, the acme.cert state would return that a change was pending
during a test run even in the case that the certificate would not have
been touched.
Changed the return value in this case so that it is not thought to
require a change.
This is reported in #40208 [0] and is also referenced in #42763 [1].
The issue #40208 looks to go on to recommend further changes beyond the
scope of this 'quick fix'.
[0] https://github.com/saltstack/salt/issues/40208#issuecomment-289637588
[1] https://github.com/saltstack/salt/issues/42763#issuecomment-345728031
2017-11-20 16:00:36 +00:00
Nicole Thomas
2eca2fe219
Merge branch 'develop' into requisite_without_module_name
2017-11-20 09:22:48 -05:00
rallytime
90d1cb221d
Add documentation about logging before modules are loaded
2017-11-20 09:05:49 -05:00
Roald Nefs
ac1a4d0817
Updated Telegram returner test
...
- Removed trailing newlines
2017-11-20 10:41:08 +01:00
Roald Nefs
47147e2769
Added new Telegram module
...
Added a new Telegram module, which allows to send a message via Telegram
using the Telegram Bot API. The commit also includes:
- Update for the Telegram returner (merged in #44148 ); the Telegram
returner now fully utilizes the Telegram module.
- Update to the documentation in order to add the Telegram module to the
list list of all modules.
- Updated Telegram returner test.
- New Telegram module test.
2017-11-20 08:47:57 +01:00
Mike Place
717dd8e549
Merge pull request #44591 from anitakrueger/add-feature-nexus
...
Adding nexus state and module including unit tests
2017-11-19 23:44:09 +00:00
Mike Place
f55b9daa63
Merge pull request #44596 from roaldnefs/fix-mattermost-doc
...
Fixed Mattermost module documentation
2017-11-19 23:30:52 +00:00
Roald Nefs
549f4806ce
Fixed documentation in Mattermost module
...
- Updated the code examples.
- Added extra whitspace where needed.
2017-11-19 19:45:21 +01:00
Jorge Schrauwen
409acc1b1b
Also add tests for zpool.scrub
2017-11-19 12:16:29 +01:00
Jorge Schrauwen
64e0b45e51
Add tests for zpool.labelclear and zpool.split
2017-11-19 12:09:36 +01:00
Jorge Schrauwen
4829157d3d
Switch from exists() to __salt__['zpool.exists']
...
To make writing testing easier, make internal calls to exists() use
the salt calling interface.
2017-11-19 12:03:31 +01:00
Jorge Schrauwen
97ac9d0793
The hint to use force is not stdout but also stderr, filter that out for labelclear
2017-11-19 11:03:04 +01:00
Jorge Schrauwen
217a268bdd
Merge branch 'develop' into zpoolupdate
2017-11-19 10:15:12 +01:00
skjaro
766a1425fd
Merge branch 'develop' into ipset-add-new-options
2017-11-19 10:12:34 +01:00
Mike Place
601b94644c
Merge pull request #44585 from rallytime/followup-44416
...
Update new boto_kinesis.list_streams function
2017-11-18 18:42:36 +01:00
Mike Place
621283c9cf
Merge pull request #44587 from rallytime/stale-config-update
...
Reduce the number of days an issue is stale by 15
2017-11-18 18:40:34 +01:00
skjaro
f5dbab21ca
Fix multiple spaces on entry options start
2017-11-18 18:36:46 +01:00
Anita Krueger
d3c4f6026b
Adding nexus state and module including unit tests
2017-11-18 15:31:37 +00:00
skjaro
361205d6c5
add new set types hash:mac and hash:ip,mark and create option skbinfo
...
Fixes state discarding options with entries
2017-11-17 22:43:07 +01:00
rallytime
cc99cb61b9
Reduce the number of days an issue is stale by 15
2017-11-17 15:31:48 -05:00
rallytime
0a38d4336e
Update new boto_kinesis.list_streams function
...
This is a follow up to PR #44416
This change just makes the new list_streams function comply with
Salt standards a little more nicely:
- variables should be at least 3 letters long
- don't use camelcase for variable names
- use code-block formatting for docs
2017-11-17 13:20:33 -05:00
Nicole Thomas
cada9cbf85
Merge pull request #44416 from bodhi-space/infra5854
...
INFRA-5854 - add list_streams to boto_kinesis exec module
2017-11-17 13:16:15 -05:00
Nicole Thomas
f84a2b5ab1
Merge pull request #44528 from bodhi-space/infra5978
...
INFRA-5978 - fix for https://github.com/saltstack/salt/issues/44290
2017-11-17 12:35:44 -05:00
Nicole Thomas
7f2dd0382c
Merge pull request #44537 from Ch3LL/ssh_highlow
...
Add multiple salt-ssh state integration tests
2017-11-17 12:17:47 -05:00
Nicole Thomas
c032439a0e
Merge pull request #44542 from lozzd/patch-1
...
Clarify error for compound command arguments
2017-11-17 12:13:16 -05:00
rallytime
d50b7e0062
Handle deprecation path for pki_dir in verify_env util
...
In PR #43474 , a new option was added named "sensitive_dirs". This
option was intended to replace "pki_dir". However, we don't want to
drop support for pki_dir out from under people so we need to put
pki_dir on a deprecation path.
I have also moved the new sensitive_dirs option to the _end_ of the
list of kwargs. That way, if other users are using positional kwargs,
we won't break those references either. People will have time to adjust
their calls to verify_env when they see the warning.
2017-11-17 10:34:30 -05:00
