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

rename default git.properties to apollo.git.properties to avoid potential conflict #3390

Merged
merged 1 commit into from
Nov 22, 2020

Conversation

nobodyiam
Copy link
Member

What's the purpose of this PR

rename default git.properties to apollo.git.properties to avoid potential conflict

Which issue(s) this PR fixes:

Fixes #3386

Brief changelog

change git.properties to apollo.git.properties

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

  • Read the Contributing Guide before making this pull request.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit tests to verify the code.
  • Run mvn clean test to make sure this pull request doesn't break anything.

@codecov-io
Copy link

codecov-io commented Nov 22, 2020

Codecov Report

Merging #3390 (92b78e3) into master (6ce0932) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #3390   +/-   ##
=========================================
  Coverage     51.51%   51.51%           
  Complexity     2307     2307           
=========================================
  Files           441      441           
  Lines         13762    13762           
  Branches       1400     1400           
=========================================
  Hits           7089     7089           
  Misses         6185     6185           
  Partials        488      488           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6ce0932...92b78e3. Read the comment docs.

@nobodyiam nobodyiam force-pushed the rename-git-properties branch from 253ffd8 to 44eb62e Compare November 22, 2020 07:14
apollo-common/src/main/resources/application.properties Outdated Show resolved Hide resolved
pom.xml Outdated Show resolved Hide resolved
@nobodyiam nobodyiam force-pushed the rename-git-properties branch from 44eb62e to 92b78e3 Compare November 22, 2020 11:46
Copy link
Member

@nisiyong nisiyong left a comment

Choose a reason for hiding this comment

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

LGTM

@nisiyong nisiyong merged commit 1aade1e into apolloconfig:master Nov 22, 2020
@nobodyiam nobodyiam added this to the 1.8.0 milestone Feb 11, 2021
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.

apollo-core的包里面包含了git.properties的文件
3 participants