Skip to content

/flux

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

Add a line to docs #2010

Merged
merged 1 commit into from May 8, 2019

Conversation

@xtellurian
Copy link
Contributor

xtellurian commented May 3, 2019

This is a very small PR, but one that I hope saves others.

  • Adding an explicit warning to users that Flux ignores JSON files.
@xtellurian
Updated FAQ.md
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
df0b48a 
Adding an explicit warning to users that Flux ignores JSON files.
@squaremo
squaremo approved these changes May 7, 2019
View changes
Copy link
Member

squaremo left a comment

Yep, this is a well-judged place to put that caveat -- thanks @xtellurian
@squaremo

This comment has been minimized.

Sign in to view
Copy link
Member

squaremo commented May 7, 2019

@xtellurian Can you rebase onto the latest head of master, and git push --force-with-lease please? There shouldn't be any conflicts. (Usually I would just do this and push to the source branch of a PR, but you've created this from your master, so I'm reluctant to do so in this case.)
@squaremo squaremo merged commit bea9650 into fluxcd:master May 8, 2019
2 checks passed
2 checks passed
ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: e2e-testing Your tests passed on CircleCI!
Details
@hiddeco hiddeco added this to the v1.12.3 milestone May 8, 2019
@squaremo

This comment has been minimized.

Sign in to view
Copy link
Member

squaremo commented May 8, 2019

(Never mind, since it was straight-forward I just bypassed the up-to-date check.)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@squaremo squaremo

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  v1.12.3
3 participants
@xtellurian @squaremo @hiddeco
You can’t perform that action at this time.