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

Support data source integrate with spring cloud config #899

Merged
merged 43 commits into from
Aug 20, 2019
Merged

Support data source integrate with spring cloud config #899

merged 43 commits into from
Aug 20, 2019

Commits on May 9, 2019

  1. com.alibaba.csp.sentinel.node.StatisticNode#curThreadNum 

    using the LongAdder rather than AtomicInteger to Provides better performance
    Lin.Liang authored and Lin.Liang committed May 9, 2019
    Configuration menu
    Copy the full SHA
    11dba5e View commit details
    Browse the repository at this point in the history

Commits on May 11, 2019

  1. reformat the code according to Alibaba Java Coding Guideline

    liangl authored and liangl committed May 11, 2019
    Configuration menu
    Copy the full SHA
    362f326 View commit details
    Browse the repository at this point in the history

  2. reformat the code according to Alibaba Java Coding Guideline

    liangl authored and liangl committed May 11, 2019
    Configuration menu
    Copy the full SHA
    50d2a5a View commit details
    Browse the repository at this point in the history

Commits on May 25, 2019

  1. Merge pull request #1 from alibaba/master 

    merge master
    @linlinisme
    linlinisme authored May 25, 2019
    Configuration menu
    Copy the full SHA
    509ecf2 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2019

  1. Remove the one redundant space....

    liangl authored and liangl committed May 28, 2019
    Configuration menu
    Copy the full SHA
    01bda6b View commit details
    Browse the repository at this point in the history

Commits on May 31, 2019

  1. fix issue 62 : Support customized log directory and configuration pro… 

    …perties directory
    liangl authored and liangl committed May 31, 2019
    Configuration menu
    Copy the full SHA
    ce717e9 View commit details
    Browse the repository at this point in the history

  2. use System.getProperty to get the property

    liangl authored and liangl committed May 31, 2019
    Configuration menu
    Copy the full SHA
    b8e66b8 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2019

  1. Merge pull request #2 from alibaba/master 

    merge online
    @linlinisme
    linlinisme authored Jun 14, 2019
    Configuration menu
    Copy the full SHA
    5c6600d View commit details
    Browse the repository at this point in the history

  2. merge master latest code

    liangl authored and liangl committed Jun 14, 2019
    Configuration menu
    Copy the full SHA
    9999154 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2019

  1. using SentinelConfigLocator to load sentinel-core config, LogConfigLo… 

    …cator to load log config
    liangl authored and liangl committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    8f9339b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from alibaba/master 

    merge onlie
    @linlinisme
    linlinisme authored Jun 19, 2019
    Configuration menu
    Copy the full SHA
    2f485b4 View commit details
    Browse the repository at this point in the history

  3. merge remote master

    liangl authored and liangl committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    c6dd24d View commit details
    Browse the repository at this point in the history

  4. fix typo

    liangl authored and liangl committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    810d40a View commit details
    Browse the repository at this point in the history

  5. add null judge

    liangl authored and liangl committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    3f98b62 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2019

  1. Reorganize the code

    liangl authored and liangl committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    23244e9 View commit details
    Browse the repository at this point in the history

  2. Reorganize the code

    liangl authored and liangl committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    bd8a481 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. add config test cases

    liangl authored and liangl committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    e6bbf79 View commit details
    Browse the repository at this point in the history

  2. ConfigUtil.loadPropertiesFromFile when file not exist return null

    liangl authored and liangl committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    c91b963 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2019

  1. rename classname and method name

    liangl authored and liangl committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    d401c2f View commit details
    Browse the repository at this point in the history

  2. rename classname and method name

    liangl authored and liangl committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    85173a5 View commit details
    Browse the repository at this point in the history

  3. using File.separator to replace "/"

    liangl authored and liangl committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    4510234 View commit details
    Browse the repository at this point in the history

  4. support retrieve properties from classpath file

    liangl authored and liangl committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    c068edd View commit details
    Browse the repository at this point in the history

  5. support retrieve properties from classpath file

    liangl authored and liangl committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    9af06c9 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2019

  1. add feature support : retrieve properties from relative file

    liangl authored and liangl committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    014cda3 View commit details
    Browse the repository at this point in the history

  2. reformat code

    liangl authored and liangl committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    a899dc6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4 from alibaba/master 

    merge online
    @linlinisme
    linlinisme authored Jul 1, 2019
    Configuration menu
    Copy the full SHA
    419d97f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'remotes/origin/master' into 20190531-fi… 

    …x-issue62
    liangl authored and liangl committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    80f283e View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2019

  1. spring-config-datasource develop

    liangl authored and liangl committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    8af3a2e View commit details
    Browse the repository at this point in the history

  2. Revert "rename classname and method name" 

    This reverts commit d401c2f
    liangl authored and liangl committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    14a1d5b View commit details
    Browse the repository at this point in the history

  3. add copy right doc

    liangl authored and liangl committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    ea18020 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2019

  1. reset commit

    liangl authored and liangl committed Jul 6, 2019
    Configuration menu
    Copy the full SHA
    c562474 View commit details
    Browse the repository at this point in the history

  2. remove unused code

    liangl authored and liangl committed Jul 6, 2019
    Configuration menu
    Copy the full SHA
    c71759f View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2019

  1. commit resources dir

    liangl authored and liangl committed Jul 8, 2019
    Configuration menu
    Copy the full SHA
    8b83172 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2019

  1. Data source integrate with spring cloud config

    liangl authored and liangl committed Jul 9, 2019
    Configuration menu
    Copy the full SHA
    f99997c View commit details
    Browse the repository at this point in the history

  2. rename bootstrap.yml

    liangl authored and liangl committed Jul 9, 2019
    Configuration menu
    Copy the full SHA
    aad8b63 View commit details
    Browse the repository at this point in the history

  3. add doc

    liangl authored and liangl committed Jul 9, 2019
    Configuration menu
    Copy the full SHA
    5abb349 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2019

  1. merge alibaba master

    liangl authored and liangl committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    d387b47 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'remotes/origin/master' into spring-conf… 

    …ig-datasource
    liangl authored and liangl committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    cf19eba View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2019

  1. add code doc、test cases

    liangl authored and liangl committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    6d60646 View commit details
    Browse the repository at this point in the history

  2. add README.md

    liangl authored and liangl committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    102ad7c View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2019

  1. add SpringConfigListener

    liangl authored and liangl committed Aug 5, 2019
    Configuration menu
    Copy the full SHA
    c2b8c8d View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2019

  1. Merge branch 'master' into spring-config-datasource

    @linlinisme
    linlinisme authored Aug 14, 2019
    Configuration menu
    Copy the full SHA
    17b898e View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2019

  1. improve document instruction.

    liangl authored and liangl committed Aug 18, 2019
    Configuration menu
    Copy the full SHA
    e6403a1 View commit details
    Browse the repository at this point in the history