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

Optimize constants #212

Merged
merged 34 commits into from
Apr 12, 2019
Merged

Optimize constants #212

merged 34 commits into from
Apr 12, 2019

Commits on Oct 10, 2018

  1. Merge pull request #4 from alipay/master 

    sync code from upstream
    @glmapper
    glmapper committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    9aa096b View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2018

  1. Merge branch 'master-alipay'

    卫恒 committed Nov 8, 2018
    Configuration menu
    Copy the full SHA
    3a897b4 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2018

  1. Merge branch 'master-alipay'

    卫恒 committed Nov 21, 2018
    Configuration menu
    Copy the full SHA
    d50a8a2 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2018

  1. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    27923f4 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2018

  1. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Dec 27, 2018
    Configuration menu
    Copy the full SHA
    c6461b8 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2019

  1. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    c4652c4 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2019

  1. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Jan 7, 2019
    Configuration menu
    Copy the full SHA
    7758538 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2019

  1. Merge branch 'master-alipay'

    卫恒 committed Jan 25, 2019
    Configuration menu
    Copy the full SHA
    1c94b31 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2019

  1. Merge branch 'master-alipay'

    卫恒 committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    518d87f View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2019

  1. Merge branch 'master-alipay'

    卫恒 committed Jan 31, 2019
    Configuration menu
    Copy the full SHA
    f74b0b3 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2019

  1. Merge branch 'master-alipay'

    卫恒 committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    3c09b2a View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2019

  1. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    7747345 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2019

  1. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    2832112 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    72b0467 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2019

  1. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Mar 4, 2019
    Configuration menu
    Copy the full SHA
    ad04066 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2019

  1. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Mar 12, 2019
    Configuration menu
    Copy the full SHA
    824628f View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2019

  1. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    50d352c View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2019

  1. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Mar 22, 2019
    Configuration menu
    Copy the full SHA
    954d037 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2019

  1. Merge remote-tracking branch 'upstream/master'

    卫恒 committed Mar 26, 2019
    Configuration menu
    Copy the full SHA
    ad9793a View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2019

  1. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    298a782 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master-alipay'

    卫恒 committed Mar 28, 2019
    Configuration menu
    Copy the full SHA
    9160ad1 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2019

  1. optimize constants

    卫恒 committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    27245c0 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2019

  1. Merge branch 'master' of https://github.com/alipay/sofa-tracer into m… 

    …aster-alipay
    卫恒 committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    1590434 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2019

  1. Merge branch 'master-alipay'

    卫恒 committed Apr 7, 2019
    Configuration menu
    Copy the full SHA
    c6e47d4 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2019

  1. use english commnet

    卫恒 committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    f866abf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into optimize-constants

    卫恒 committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    c43f948 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2019

  1. Merge pull request #6 from alipay/master 

    Upgrade to 2.4.1-SNAPSHOT.
    @glmapper
    glmapper committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    5b5bfe9 View commit details
    Browse the repository at this point in the history

  2. optimize-constants

    卫恒 committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    126c208 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7 from glmapper/remove-chinese-annotation-and-sta… 

    …ndardize-the-code

use english commnet
    @glmapper
    glmapper committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    455577e View commit details
    Browse the repository at this point in the history

  4. use english commnet

    卫恒 committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    ee95b73 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2019

  1. Merge branch 'master-alipay' into optimize-constants 

    # Conflicts:
#	sofa-tracer-plugins/sofa-tracer-dubbo-plugin/src/main/java/com/alipay/sofa/tracer/plugins/dubbo/DubboSofaTracerFilter.java
#	sofa-tracer-plugins/sofa-tracer-dubbo-plugin/src/main/java/com/alipay/sofa/tracer/plugins/dubbo/stat/DubboClientStatJsonReporter.java
#	sofa-tracer-plugins/sofa-tracer-dubbo-plugin/src/main/java/com/alipay/sofa/tracer/plugins/dubbo/stat/DubboServerStatJsonReporter.java
#	sofa-tracer-plugins/sofa-tracer-springmvc-plugin/src/main/java/com/alipay/sofa/tracer/plugins/springmvc/SpringMvcDigestJsonEncoder.java
#	sofa-tracer-plugins/sofa-tracer-springmvc-plugin/src/main/java/com/alipay/sofa/tracer/plugins/springmvc/SpringMvcJsonStatReporter.java
#	tracer-core/src/main/java/com/alipay/common/tracer/core/constants/SofaTracerConstant.java
    卫恒 committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    ab7dedb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from alipay/master 

    Use english comment (sofastack#211)
    @glmapper
    glmapper committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    3e395c9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into optimize-constants

    卫恒 committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    7d46bf4 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2019

  1. Merge pull request #9 from glmapper/optimize-constants 

    Optimize constants
    @glmapper
    glmapper committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    510e1d3 View commit details
    Browse the repository at this point in the history