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

V3.0 develop sync develop #12855

Merged

Conversation

KomachiSion
Copy link
Collaborator

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

XXXXX

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

shiyiyue1102 and others added 12 commits July 26, 2024 17:04
* 34567

* refactor gray model

* pmd checkstyle

* 兼容性处理

* 灰度增量对账

* 升级内容字段编码,添加gray表

* pmd and checkstyle

* merge develop fix conflict

* derby create gray table

* modify gray table sql

* derby sql bugfix

* fix test case

* fix test case

* fix test case
…libaba#12507)

* Refine the formal configuration and add additional information(alibaba#12217)

* Change the "configType" field to "publishType"(alibaba#12217)

* Improve the gray configuration(alibaba#12217)

* add the reconciliation mechanism of gray configuration(alibaba#12217)

* Change the JSON format of gray rule.(alibaba#12217)

* Remove redundant queries(alibaba#12217)

* fix reconciliation mechanism of gray configuration.(alibaba#12217)

* Adjust the way of obtaining grayName.(alibaba#12217)

* Change the variable name.(alibaba#12217
…h-refactor

# Conflicts:
#	config/src/main/java/com/alibaba/nacos/config/server/constant/PropertiesConstant.java
#	config/src/main/java/com/alibaba/nacos/config/server/remote/ConfigChangeClusterSyncRequestHandler.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/dump/disk/ConfigRawDiskService.java
#	config/src/test/java/com/alibaba/nacos/config/server/service/dump/disk/ConfigRawDiskServiceTest.java
#	console/src/main/resources/static/index.html
#	console/src/main/resources/static/js/main.js
…nsistent. (alibaba#12815)

fix(alibaba#11930): the information of default namespace should be consistent.

fix(alibaba#11930): the information of default namespace should be consistent.
2.simplify gray model
3.gray model upgrade compatible
…0-develop-sync-develop

# Conflicts:
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	config/src/main/java/com/alibaba/nacos/config/server/model/form/ConfigForm.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/ConfigOperationService.java
#	console-ui/src/pages/ConfigurationManagement/ConfigRollback/ConfigRollback.js
#	console-ui/src/pages/ConfigurationManagement/HistoryDetail/HistoryDetail.js
#	console/src/main/resources/application.properties
#	console/src/main/resources/static/index.html
#	console/src/main/resources/static/js/main.js
Copy link

Thanks for your this PR. 🙏
Please check again for your PR changes whether contains any usage/api/configuration change such as Add new API , Add new configuration, Change default value of configuration.
If so, please add or update documents(markdown type) in docs/next/ for repository nacos-group/nacos-group.github.io


感谢您提交的PR。 🙏
请再次查看您的PR内容,确认是否包含任何使用方式/API/配置参数的变更,如:新增API新增配置参数修改默认配置等操作。
如果是,请确保在提交之前,在仓库nacos-group/nacos-group.github.io中的docs/next/目录下添加或更新文档(markdown格式)。

@KomachiSion KomachiSion merged commit 2b3fca3 into alibaba:v3.0-develop Nov 15, 2024
2 checks passed
@KomachiSion KomachiSion deleted the v3.0-develop-sync-develop branch November 15, 2024 08:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants