Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly reference the default bucket for the release task #9493

Merged
merged 1 commit into from
Dec 15, 2016

Conversation

tylersmalley
Copy link
Contributor

The configuration is nested under options instead of config in the new aws_s3 library.

The configuration is nested under options instead of config in the new aws_s3 library.

Signed-off-by: Tyler Smalley <[email protected]>
@tylersmalley tylersmalley added Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc bug Fixes for quality problems that affect the customer experience review v6.0.0 labels Dec 14, 2016
@@ -37,7 +37,7 @@ module.exports = function (grunt) {
grunt.config('aws_s3.options', {
accessKeyId: config.key,
secretAccessKey: config.secret,
bucket: config.bucket || grunt.config.get('aws_s3.config.bucket'),
bucket: config.bucket || grunt.config.get('aws_s3.options.bucket'),
Copy link
Contributor Author

@tylersmalley tylersmalley Dec 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@epixa
Copy link
Contributor

epixa commented Dec 15, 2016

LGTM

@tylersmalley tylersmalley merged commit 4b6d627 into elastic:master Dec 15, 2016
@tylersmalley tylersmalley deleted the release-bucket branch December 15, 2016 02:03
elastic-jasper added a commit that referenced this pull request Dec 15, 2016
Backports PR #9493

**Commit 1:**
Correctly reference the default bucket for the release task

The configuration is nested under options instead of config in the new aws_s3 library.

Signed-off-by: Tyler Smalley <[email protected]>

* Original sha: 789b2bf
* Authored by Tyler Smalley <[email protected]> on 2016-12-14T23:26:43Z
tylersmalley pushed a commit that referenced this pull request Dec 15, 2016
Backports PR #9493

**Commit 1:**
Correctly reference the default bucket for the release task

The configuration is nested under options instead of config in the new aws_s3 library.

Signed-off-by: Tyler Smalley <[email protected]>

* Original sha: 789b2bf
* Authored by Tyler Smalley <[email protected]> on 2016-12-14T23:26:43Z
@epixa
Copy link
Contributor

epixa commented Dec 15, 2016

@tylersmalley Is this broken on 5.1 and 5.0? If so, can you backport this there as well? What about 4.7?

@epixa epixa added Team:Operations Team label for Operations Team and removed Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc labels Dec 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Fixes for quality problems that affect the customer experience review Team:Operations Team label for Operations Team v5.2.0 v6.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants