Commit Graph

84905 Commits

Author SHA1 Message Date
Ch3LL
693a504ef0 update release notes with cve number 2017-08-15 11:57:33 -04:00
Daniel Wallace
bd63074e7a create new ip address before checking list of allocated ips
This will help prevent a race condition of all cloud servers being built in
parallel trying to build with the same floating ip address.
2017-08-15 09:19:05 -06:00
Nicole Thomas
c1c8cb9bfa Merge pull request #42868 from carsonoid/redisjobcachefix
Stub out required functions in redis_cache
2017-08-15 10:33:54 -04: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
e192d6e0af Merge pull request #42810 from amendlik/win-snmp-community
Ignore error values when listing Windows SNMP community strings
2017-08-14 21:55:15 -06: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
a1817f1de3 Merge pull request #42920 from cachedout/pid_race
pid_race
2017-08-14 21:49:09 -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
Mike Place
11a33fe692 Merge pull request #42925 from terminalmage/f26-debug-logging
Add debug logging to troubleshoot test failures
2017-08-14 21:47:50 -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
Erik Johnson
8165f46165 Add debug logging to troubleshoot test failures
This adds logging to troubleshoot https://github.com/saltstack/salt-jenkins/issues/477
2017-08-14 16:28:09 -05:00
rallytime
3136050177 Reduce the number of days an issue is stale by 15 2017-08-14 17:08:05 -04:00
Nicole Thomas
c0ff69f88c Merge pull request #42836 from lyft/backport-utils.versions-to-2016.11
Backport salt.utils.versions from develop to 2016.11
2017-08-14 16:56:54 -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
Nicole Thomas
a537197030 Merge pull request #42913 from twangboy/win_change_timeout
Change service shutdown timeouts for salt-minion service (Windows)
2017-08-14 16:55:24 -04:00
Mike Place
ca0555f616 Merge pull request #42800 from skizunov/develop6
Fix exception when master_type=disable
2017-08-14 13:53:37 -07:00
Nicole Thomas
3af264b664 Merge pull request #42679 from cloudflare/napalm-multiprocessing
Add multiprocessing option for NAPALM proxy
2017-08-14 16:45:05 -04:00
Nicole Thomas
64a79dd5ac Merge pull request #42919 from rallytime/bp-42871
Back-port #42871 to 2016.11
2017-08-14 16:43:59 -04:00
Nicole Thomas
bea8ec1098 Merge pull request #42918 from rallytime/bp-42848
Back-port #42848 to 2016.11
2017-08-14 16:43:42 -04: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
Nicole Thomas
4fcdab3ae9 Merge pull request #42657 from nhavens/2017.7
back-port #42612 to 2017.7
2017-08-14 15:42:25 -04:00
Mike Place
5e930b8cbd If we catch the pid file in a transistory state, return None 2017-08-14 12:23:27 -07:00
garethgreenaway
9e0499e551 Merge branch 'develop' into datadog-events_api 2017-08-14 12:08:01 -07:00
Mike Place
52bce329cb Merge pull request #42861 from twangboy/win_pkg_install_salt
Fix pkg.install salt-minion using salt-call
2017-08-14 12:07:22 -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
Gareth J. Greenaway
1ec4ccba85 Renaming all tests to be consistent with naming. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
0b227e3b63 Include PR #42207 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
23d572199a Adding test_beacon for the beacon state module. Updating beacon state module documentation. Removing over aggressive code in the validate function for service beacon. 2017-08-14 12:04:38 -07:00