Skip to content

Conversation

imumesh18
Copy link
Contributor

Proposed changes

Add documentaion for fluentd-sub-second-precision flag in fluentd plugin.

Added a short description for fluentd-sub-second-precision flag in fluentd.md.

Unreleased project version (optional)

Not sure.

Team
area/engine

Related issues (optional)

Closes #5425

@anusha-ragunathan
Copy link
Contributor

LGTM

@anusha-ragunathan
Copy link
Contributor

cc @thaJeztah

@joaofnfernandes
Copy link
Contributor

LGTM, we just need moby/moby#35529 to get merged before merging the docs.

@joaofnfernandes joaofnfernandes added area/engine Issue affects Docker engine/daemon depends-on-upstream-merge labels Dec 4, 2017
@imumesh18
Copy link
Contributor Author

moby/moby#35529 was merged, so we can merge this 👍

cc @joaofnfernandes @thaJeztah

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@thaJeztah
Copy link
Member

@joaofnfernandes I noticed this is against master, but will be in the upcoming 17.12 release, so we should merge after release (or reopen against vnext-engine - let me know what you prefer

@thaJeztah thaJeztah added this to the engine/17.12 milestone Dec 5, 2017
@thaJeztah thaJeztah changed the title Added documentation for fluentd plugin sub-second-precision flag. [17.12] Added documentation for fluentd plugin sub-second-precision flag. Dec 5, 2017
@joaofnfernandes
Copy link
Contributor

I think vnext-engine makes more sense. @dungeonmaster18 can you update this PR to be against the vnext-engine branch instead of master?

@imumesh18
Copy link
Contributor Author

Yup sure.

@imumesh18 imumesh18 closed this Dec 8, 2017
@imumesh18 imumesh18 deleted the docs-fluentd-flag branch December 8, 2017 07:54
@imumesh18 imumesh18 changed the base branch from master to vnext-engine December 8, 2017 08:04
@imumesh18 imumesh18 restored the docs-fluentd-flag branch December 8, 2017 08:04
@imumesh18
Copy link
Contributor Author

@joaofnfernandes I have update

@imumesh18 imumesh18 reopened this Dec 8, 2017
@joaofnfernandes
Copy link
Contributor

@dungeonmaster18 it seems that you have some conflicts in your PR. Can you rebase your branch on vnext-engine? If that's too much work, you can start a new branch from vnext-engine and submit a new PR instead.

@imumesh18
Copy link
Contributor Author

closing this and opening new pr #5471

cc @joaofnfernandes

@imumesh18 imumesh18 closed this Dec 9, 2017
@imumesh18 imumesh18 deleted the docs-fluentd-flag branch December 9, 2017 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/engine Issue affects Docker engine/daemon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants