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

nfs: update documentation and example (bp #6440) #6467

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 20, 2020

This is an automated backport of pull request #6440 done by Mergify

Cherry-pick of c22189b has failed:

On branch mergify/bp/release-1.4/pr-6440
Your branch is up to date with 'origin/release-1.4'.

You are currently cherry-picking commit c22189ba7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   Documentation/nfs.md
	modified:   cluster/examples/kubernetes/nfs/nfs-ceph.yaml
	new file:   cluster/examples/kubernetes/nfs/psp.yaml
	new file:   cluster/examples/kubernetes/nfs/rbac.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   cluster/examples/kubernetes/nfs/nfs.yaml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

Signed-off-by: Ahmad Nurus S <prksu.sh@gmail.com>
(cherry picked from commit c22189b)

# Conflicts:
#	cluster/examples/kubernetes/nfs/nfs.yaml
@mergify mergify bot added the conflicts label Oct 20, 2020
@galexrt
Copy link
Member

galexrt commented Oct 20, 2020

Closing in favor of #6455

@galexrt galexrt closed this Oct 20, 2020
@galexrt galexrt deleted the mergify/bp/release-1.4/pr-6440 branch October 20, 2020 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants