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

Dubbo-2013 #2114

Merged
merged 15 commits into from
Jul 25, 2018
Merged

Dubbo-2013 #2114

merged 15 commits into from
Jul 25, 2018

Commits on May 28, 2018

  1. parameter是一个注解对象，此处调用它的key方法没有实际用处，所以删除这一行代码

    @tswstarplanet
    tswstarplanet committed May 28, 2018
    Configuration menu
    Copy the full SHA
    6b0bd1a View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2018

  1. Merge branch 'pr/1' 

    # Conflicts:
#	dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractConfig.java
    @tswstarplanet
    tswstarplanet committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    cd8e97d View commit details
    Browse the repository at this point in the history

  2. fix the potential null pointer exception

    @tswstarplanet
    tswstarplanet committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    20644bc View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2018

  1. Merge pull request #2 from apache/master 

    update from official
    @tswstarplanet
    tswstarplanet authored Jul 6, 2018
    Configuration menu
    Copy the full SHA
    06a0ca4 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. Merge pull request #3 from apache/master 

    合并官方代码
    @tswstarplanet
    tswstarplanet authored Jul 12, 2018
    Configuration menu
    Copy the full SHA
    a4793ba View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2018

  1. Merge pull request #4 from apache/master 

    合并官方库
    @tswstarplanet
    tswstarplanet authored Jul 17, 2018
    Configuration menu
    Copy the full SHA
    a0bc50d View commit details
    Browse the repository at this point in the history

  2. Add the corethreads tag to the complex tab <dubbo:protocol>

    @tswstarplanet
    tswstarplanet committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    a93a5db View commit details
    Browse the repository at this point in the history

  3. 删除不确定是否有问题的issue的提交代码

    @tswstarplanet
    tswstarplanet committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    e8e2a2d View commit details
    Browse the repository at this point in the history

  4. delete the unnecessary import

    @tswstarplanet
    tswstarplanet committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    31a9164 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2018

  1. Merge pull request #5 from apache/master 

    合并官方代码
    @tswstarplanet
    tswstarplanet authored Jul 19, 2018
    Configuration menu
    Copy the full SHA
    967c739 View commit details
    Browse the repository at this point in the history

  2. add a tag "threadpool" to the complex tag "consumer"

    @tswstarplanet
    tswstarplanet committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    6796da2 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2018

  1. add a tag "threadpool" to the complex tag "consumer"; add the test code

    @tswstarplanet
    tswstarplanet committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    7e70a68 View commit details
    Browse the repository at this point in the history

  2. add a tag "threadpool" to the complex tag "consumer"; note

    @tswstarplanet
    tswstarplanet committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    1316623 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2018

  1. fix an error in unit test

    @tswstarplanet
    tswstarplanet committed Jul 21, 2018
    Configuration menu
    Copy the full SHA
    58980c3 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2018

  1. add tag 'threadpool', 'corethreads', 'threads', 'queues' to the compl… 

    …ex tag <dubbo:consumer> so the consumer can config the threadpool
    @tswstarplanet
    tswstarplanet committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    889060b View commit details
    Browse the repository at this point in the history