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.

Sign up for GitHub

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

Jump to bottom

Use github.com/ghodss/yaml to parse k8s config (#5642) #5643

Merged
merged 1 commit into from
Apr 2, 2019
Merged

Use github.com/ghodss/yaml to parse k8s config (#5642) #5643

merged 1 commit into from
Apr 2, 2019

Conversation

liispon
Copy link
Contributor

@liispon liispon commented Mar 27, 2019 •
edited by glinton
Loading

Required for all PRs:

  • Signed CLA.
  • Associated README.md updated.
  • Has appropriate unit tests.

Resolves #5642

@glinton glinton added feat Improvement on an existing feature such as adding a new setting/mode to an existing plugin fix pr to fix corresponding bug and removed feat Improvement on an existing feature such as adding a new setting/mode to an existing plugin labels Mar 27, 2019
@danielnelson danielnelson added this to the 1.10.2 milestone Mar 27, 2019
danielnelson
danielnelson reviewed Mar 27, 2019
View reviewed changes
Copy link
Contributor

@danielnelson danielnelson left a comment

Choose a reason for hiding this comment

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

Can you rebase and run dep ensure again?

Gopkg.lock Outdated Show resolved Hide resolved
@danielnelson
Copy link
Contributor

Hmm, that wasn't enough to keep the source lines in the Gopkg.lock. You may need to start over with this file:

git checkout 3045ffbbe3aadd46ccbf97644083a56008a4eac8 -- Gopkg.lock
dep ensure

@liispon
Copy link
Contributor Author

liispon commented Apr 2, 2019

Hmm, that wasn't enough to keep the source lines in the Gopkg.lock. You may need to start over with this file:

git checkout 3045ffbbe3aadd46ccbf97644083a56008a4eac8 -- Gopkg.lock
dep ensure

Done. Thanks.

@danielnelson danielnelson merged commit 3b80d8a into influxdata:master Apr 2, 2019
danielnelson pushed a commit that referenced this pull request Apr 2, 2019
@liispon @danielnelson
Use github.com/ghodss/yaml to parse k8s config (#5643)
a0d7d45 
(cherry picked from commit 3b80d8a)
dupondje pushed a commit to dupondje/telegraf that referenced this pull request Apr 22, 2019
@liispon
Use github.com/ghodss/yaml to parse k8s config (influxdata#5643)
c1da98d
hwaastad pushed a commit to hwaastad/telegraf that referenced this pull request Jun 13, 2019
@liispon
Use github.com/ghodss/yaml to parse k8s config (influxdata#5643)
87b8e21
bitcharmer pushed a commit to bitcharmer/telegraf that referenced this pull request Oct 18, 2019
@liispon @bitcharmer
Use github.com/ghodss/yaml to parse k8s config (influxdata#5643)
de5bb18
athoune pushed a commit to bearstech/telegraf that referenced this pull request Apr 17, 2020
@liispon
Use github.com/ghodss/yaml to parse k8s config (influxdata#5643)
1bf7717
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danielnelson danielnelson danielnelson left review comments

@glinton glinton glinton approved these changes

Assignees
No one assigned
Labels
fix pr to fix corresponding bug
Projects
None yet
Milestone
1.10.2
Development

Successfully merging this pull request may close these issues.
3 participants
@liispon @danielnelson @glinton