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

docs: fix indent in encrypted-storage-fields #8876

Merged
merged 1 commit into from
Mar 3, 2023
Merged

docs: fix indent in encrypted-storage-fields #8876

merged 1 commit into from
Mar 3, 2023

Conversation

Amishakumari544
Copy link
Contributor

Description

Fixes #8796

Checklist

  • I have explained the need for this PR and the problem it solves
  • I have explained the changes or the new features added to this PR
  • I have added tests corresponding to this change
  • I have updated the documentation to reflect this change
  • I have verified that this change is backward compatible (If not, please discuss on the APISIX mailing list first)

cc - @moonming @navendu-pottekkat

pottekkat
pottekkat requested changes Feb 16, 2023
View reviewed changes
Copy link
Contributor

@pottekkat pottekkat left a comment

Choose a reason for hiding this comment

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

Please remove the unrelated changes. Switch to master branch, update it to upstream, create a new branch from the master, make changes, commit and pull request.

@Amishakumari544
docs: fixed indent in encrypted-storage-fields
d56b85d 
Signed-off-by: Amishakumari544 <amishakumari544@gmail.com>
@Amishakumari544
Copy link
Contributor Author

Please remove the unrelated changes. Switch to master branch, update it to upstream, create a new branch from the master, make changes, commit and pull request.

Is it fine now? @navendu-pottekkat

@pottekkat
Copy link
Contributor

@bzp2010 Could you do a quick review and merge?

@tzssangglass
Copy link
Member

and the format of data_encryption in https://github.com/apache/apisix/blob/master/docs/zh/latest/plugin-develop.md also need to be fix

@Ajay-singh1
Copy link
Contributor

@bzp2010 Approve this changes and merge.

@pottekkat pottekkat merged commit 06149cd into apache:master Mar 3, 2023
hongbinhsu added a commit to fitphp/apix that referenced this pull request Mar 17, 2023
@hongbinhsu
Merge branch 'upstream/master' into github/master
9c6f9b8 
* upstream/master: (46 commits)
  fix(consumer): work if the etcd connection failed during starting (apache#9077)
  ci: fix low disk space error when loading saved docker images (apache#9080)
  change: change the default router from radixtree uri to radixtree hos… (apache#9047)
  chore(deps): bump dubbo from 2.7.18 to 2.7.21 in /t/lib/dubbo-backend/dubbo-backend-provider (apache#9041)
  fix: cli test on master (apache#9075)
  fix: Non wildcard origin in CORS should sent Vary header (apache#9010)
  feat: bump lua-resty-ldap version for ldap-auth (apache#9037)
  fix: invalidate cache in core.request.add_haeder and fix some calls (apache#8824)
  docs: remove unnecessary getting-started.md (apache#9054)
  docs: contribute Getting Started tutorials (apache#9046)
  docs: replace full-width quotation mark with half-width quotation mark (apache#8887)
  docs: fix typo and grammar (apache#9008)
  feat: ready to release 2.15.3 (apache#9021)
  ci: ensure the test can run with different repo name (apache#8832)
  chore(deps): bump golang.org/x/net from 0.0.0-20220722155237-a158d28d115b to 0.7.0 in /ci/pod/openfunction/function-example/test-uri (apache#9018)
  docs: improved SEO & fixed typo and localization issues (apache#8993)
  feat: release APISIX 3.2.0 (apache#8988)
  docs: fix grammar (apache#8935)
  docs: fix indent in encrypted-storage-fields (apache#8876)
  docs: k8s discovery: state the restriction on the use of port number (apache#8969)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tzssangglass tzssangglass tzssangglass approved these changes

@pottekkat pottekkat pottekkat approved these changes

@bzp2010 bzp2010 Awaiting requested review from bzp2010

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

docs(plugin-develop): wrong indent in encrypted-storage-fields
4 participants
@Amishakumari544 @pottekkat @tzssangglass @Ajay-singh1