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

Fix history time local #2845

Merged
merged 7 commits into from
Jun 15, 2020
Merged

Conversation

zhenxianyimeng
Copy link
Contributor

ISSUE #2844

What is the purpose of the change

fix bug

Brief changelog

add local param when change data to local format

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.

@KomachiSion KomachiSion added kind/bug Category issues or prs related to bug. area/Nacos console Related to Nacos consle labels Jun 11, 2020
@KomachiSion KomachiSion added this to the 1.3.1 milestone Jun 11, 2020
@KomachiSion
Copy link
Collaborator

Can you resolve conflicts first?

@zhenxianyimeng
Copy link
Contributor Author

Can you resolve conflicts first?

ok, i wiil resolve it

Copy link
Collaborator

@yanlinly yanlinly left a comment

Choose a reason for hiding this comment

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

ok

@yanlinly yanlinly self-assigned this Jun 11, 2020
@yanlinly
Copy link
Collaborator

please only update
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryRollback/HistoryRollback.js

@zhenxianyimeng
Copy link
Contributor Author

please only update
console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/HistoryRollback/HistoryRollback.js

ok i have solved it

@CLAassistant
Copy link

CLAassistant commented Jun 12, 2020

CLA assistant check
All committers have signed the CLA.

@yanlinly yanlinly merged commit a4613c4 into alibaba:develop Jun 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/Nacos console Related to Nacos consle kind/bug Category issues or prs related to bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants