This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a change to branch feat-version-manager
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.
from 753a69b feat: added version
add 2d0fcd6 fix: conflicted when update global rule (#1152)
add 1f67b66 Merge branch 'master' into feat-version-manager
No new revisions were added by this update.
Summary of changes:
api/internal/handler/global_rule/global_rule.go | 25 ++++++++++++++---
.../handler/global_rule/global_rule_test.go | 19 +++++++------
api/test/e2e/global_rule_test.go | 31 +++++++++++++++++++++-
3 files changed, 62 insertions(+), 13 deletions(-)
