Commit Graph

84736 Commits

Author SHA1 Message Date
Gareth J. Greenaway
0c0cdd8aa1 Updating the test_auth tests. 2017-08-15 20:24:40 -07:00
Gareth J. Greenaway
e6b750d6a1 Adding some integration tests. 2017-08-15 20:24:40 -07:00
Gareth J. Greenaway
96e8b90d1e Updating all instances of check_minions. 2017-08-15 20:24:40 -07:00
Gareth J. Greenaway
fcf61844d5 Making all _check functions return missing minions for consistency. General cleanup, removing debugging logs. 2017-08-15 20:24:40 -07:00
Gareth J. Greenaway
dd02d7170b experimenting with how to handle missing minions 2017-08-15 20:24:40 -07:00
Nicole Thomas
de809a934a Merge pull request #42576 from lyft/allow-returning-false-in-test-mode
Document returning False in test=True mode
2017-08-15 17:42:44 -04:00
Nicole Thomas
abac36d907 Merge pull request #42450 from pwdng/ldap_fix
Use OrderedSet instead of set to allow handling of OpenLDAP X-ORDERED…
2017-08-15 17:30:35 -04:00
Nicole Thomas
275122d04e Merge pull request #42834 from terminalmage/salt.utils.versions
Move 4 functions from salt.utils to salt.utils.versions
2017-08-15 17:28:24 -04:00
Mike Place
01d172a3f7 Merge pull request #42317 from garethgreenaway/fixing_beacons
Refactoring Beacons
2017-08-15 13:33:26 -06:00
Mike Place
eaaada5550 Merge pull request #42072 from onlyanegg/datadog-events_api
Datadog events api
2017-08-15 13:25:09 -06:00
Mike Place
4f406602cf Merge branch 'develop' into ldap_fix 2017-08-15 12:36:47 -06:00
Mike Place
b85c32daff Merge pull request #42067 from vitaliyf/softlayer-dont-split-hostname
Removed several uses of name.split('.')[0] in SoftLayer driver.
2017-08-15 12:22:40 -06:00
Erik Johnson
6be473fd9f Fix missed reference to salt.utils.compare_versions 2017-08-15 12:53:57 -05:00
Erik Johnson
338e5713cf Guard raet import in try/except
This avoids a traceback upon import of salt.utils.raetevent in the
manage runner, when raet is not installed.
2017-08-15 12:53:57 -05:00
Erik Johnson
2b76029ded Move 4 functions from salt.utils to salt.utils.versions
This moves the following functions from salt.utils to salt.utils.versions:

- warn_until
- kwargs_warn_until
- compare_versions (as salt.utils.versions.compare)
- version_cmp
2017-08-15 12:53:57 -05:00
Nicole Thomas
89cede9816 Merge pull request #42956 from Ch3LL/latest_develop
[develop] Bump latest and previous versions
2017-08-15 13:34:43 -04:00
Ch3LL
9c324d3d0c [develop] Bump latest and previous versions 2017-08-15 13:32:01 -04:00
garethgreenaway
c220372965 Merge branch 'develop' into datadog-events_api 2017-08-15 09:02:04 -07:00
garethgreenaway
8b48341a36 Merge branch 'develop' into fixing_beacons 2017-08-15 09:00:09 -07:00
Nicole Thomas
af0c8ffe36 Merge pull request #42934 from garethgreenaway/osquery_proper_error_reporting
Fixes to error reporting for osquery module
2017-08-15 10:20:56 -04:00
Nicole Thomas
d8b7afbbd1 Merge pull request #42928 from UtahDave/remove_stormpath2
Remove stormpath2
2017-08-15 10:09:23 -04:00
Mike Place
de88937491 Merge pull request #42691 from mitodl/develop
Removed erroneous line causing duplicate creation of single function
2017-08-14 22:36:17 -06:00
Mike Place
2017f36809 Merge pull request #42759 from garethgreenaway/42640_etcd_directory
Additions to etcd state module
2017-08-14 22:10:38 -06:00
Gareth J. Greenaway
57be3f64c1 Running osquery commands through cmd.run_all, when something goes wrong it still returns a retcode of 0. So look for something in stderr when errors occur instead. 2017-08-14 21:05:43 -07:00
Mike Place
db32d81d8a Merge pull request #42917 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-08-14 21:53:18 -06:00
Mike Place
ea847241e2 Merge pull request #42923 from rallytime/boto-notifications
Always notify ryan-lane when changes occur on boto files
2017-08-14 21:51:22 -06:00
Mike Place
d5c4071a17 Merge pull request #42924 from rallytime/stale-config-update
Reduce the number of days an issue is stale by 15
2017-08-14 21:48:36 -06:00
David Boucha
0ceb8009c7 remove Stormpath module, states and docs 2017-08-14 16:03:00 -06:00
David Boucha
ed7430d91b Add note about removal to release notes 2017-08-14 15:54:19 -06:00
David Boucha
02eb27004d Remove Stormpath auth. API shutting down.
Per Stormpath's announcement, their API will be shutting down on
8/17/2017 at noon PST.

https://stormpath.com/oktaplusstormpath

Closes #42914
2017-08-14 15:49:31 -06:00
rallytime
3136050177 Reduce the number of days an issue is stale by 15 2017-08-14 17:08:05 -04:00
Mike Place
61d39ffc3c Merge pull request #42802 from DarkKnightCZ/elastic-fix-instance
Refactor instance obtaining in Elasticsearch module
2017-08-14 13:55:56 -07:00
garethgreenaway
b13cd0d7c4 Merge branch 'develop' into 42640_etcd_directory 2017-08-14 13:41:18 -07:00
Mike Place
00ca6ad0b8 Merge pull request #42878 from vladislavPV/develop
fix salt consul.get module crush on empty keys
2017-08-14 13:40:31 -07:00
rallytime
182d642d05 Always notify ryan-lane when changes occur on boto files 2017-08-14 16:39:20 -04:00
garethgreenaway
9e0499e551 Merge branch 'develop' into datadog-events_api 2017-08-14 12:08:01 -07:00
Gareth J. Greenaway
702e588b36 Updating the release notes to include more examples of old & new behavior for beacon configuration. Updating example documentation in one beacon. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
42afd62de8 Adding note in release notes for beacon configuration deprecation. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
ed742bb506 Updating mock from salt.utils to salt.utils.files for fopen. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
5d6873bb84 One more python3 related fix 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
bf1aefa47b Updating memusage, ps and diskusage beacons for python3 related failures. Updating respective tests as well. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
fe5dd1e7b9 Removing unused import from ps beacon. Fixing mock for sensehat test. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
9072edd8a1 Fixing mocking for ps beacon. Types for sensehat beacon. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
d8ac1f8cfb Updating unit and integration tests for beacons to reflect changes. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
ff6f42405f Fixing typo in service beacon. Removing unused import. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
4e1fea1433 Updating logging, shuffling some imports of salt.ext.six.moves around to fix linting. better way to determine the twilio library version. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
813445d1ed Updating with various requested changes 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
cca7c0d091 Removing the wrong import, re-adding Mock and removing the ones that are not used. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
71963cccce fixing more lint issues 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
b0fb2c89d3 Fixing lint issue. 2017-08-14 12:04:38 -07:00