Commit Graph

17 Commits

Author SHA1 Message Date
Huxing Zhang 6d52ddcdbe Bump version to 2.6.2-SNAPSHOT. 2018-05-09 14:44:08 +08:00
Ian Luo 20aa3f0b2f manually merge the work made by pull request #1491 on master branch (#1554)
* Manually merge pull request #1486, to make travis ci and codecov work after apache incubator transition.

* update pom license, scm, maillists, issuemanagement, add DISCLAIMER (#1491)
2018-04-04 22:54:17 -05:00
ken.lj 4a5c5e200d
Merge pull request #1389, refactor dubbo deployment process
Fixes #1322
2018-03-06 06:04:31 -06:00
Huang YunKun 7faa3f025e Merge pull request #1391, fix typo of method name in qos module. 2018-02-26 02:23:11 -06:00
ken.lj a4632dad6c Merge branch '2.5.x'
# Conflicts:
#	all/pom.xml
#	dubbo-admin/pom.xml
#	dubbo-admin/src/main/java/com/alibaba/dubbo/governance/web/governance/module/screen/Providers.java
#	dubbo-cluster/pom.xml
#	dubbo-common/pom.xml
#	dubbo-config/dubbo-config-api/pom.xml
#	dubbo-config/dubbo-config-spring/pom.xml
#	dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/ServiceBean.java
#	dubbo-config/pom.xml
#	dubbo-container/dubbo-container-api/pom.xml
#	dubbo-container/dubbo-container-jetty/pom.xml
#	dubbo-container/dubbo-container-log4j/pom.xml
#	dubbo-container/dubbo-container-logback/pom.xml
#	dubbo-container/dubbo-container-spring/pom.xml
#	dubbo-container/pom.xml
#	dubbo-demo/dubbo-demo-api/pom.xml
#	dubbo-demo/dubbo-demo-consumer/pom.xml
#	dubbo-demo/dubbo-demo-provider/pom.xml
#	dubbo-demo/pom.xml
#	dubbo-filter/dubbo-filter-cache/pom.xml
#	dubbo-filter/dubbo-filter-validation/pom.xml
#	dubbo-filter/pom.xml
#	dubbo-maven/pom.xml
#	dubbo-monitor/dubbo-monitor-api/pom.xml
#	dubbo-monitor/dubbo-monitor-default/pom.xml
#	dubbo-monitor/pom.xml
#	dubbo-plugin/dubbo-qos/pom.xml
#	dubbo-plugin/pom.xml
#	dubbo-registry/dubbo-registry-api/pom.xml
#	dubbo-registry/dubbo-registry-default/pom.xml
#	dubbo-registry/dubbo-registry-multicast/pom.xml
#	dubbo-registry/dubbo-registry-redis/pom.xml
#	dubbo-registry/dubbo-registry-zookeeper/pom.xml
#	dubbo-registry/pom.xml
#	dubbo-remoting/dubbo-remoting-api/pom.xml
#	dubbo-remoting/dubbo-remoting-grizzly/pom.xml
#	dubbo-remoting/dubbo-remoting-http/pom.xml
#	dubbo-remoting/dubbo-remoting-mina/pom.xml
#	dubbo-remoting/dubbo-remoting-netty/pom.xml
#	dubbo-remoting/dubbo-remoting-netty4/pom.xml
#	dubbo-remoting/dubbo-remoting-p2p/pom.xml
#	dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
#	dubbo-remoting/pom.xml
#	dubbo-rpc/dubbo-rpc-api/pom.xml
#	dubbo-rpc/dubbo-rpc-default/pom.xml
#	dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java
#	dubbo-rpc/dubbo-rpc-hessian/pom.xml
#	dubbo-rpc/dubbo-rpc-http/pom.xml
#	dubbo-rpc/dubbo-rpc-injvm/pom.xml
#	dubbo-rpc/dubbo-rpc-memcached/pom.xml
#	dubbo-rpc/dubbo-rpc-redis/pom.xml
#	dubbo-rpc/dubbo-rpc-rmi/pom.xml
#	dubbo-rpc/dubbo-rpc-thrift/pom.xml
#	dubbo-rpc/dubbo-rpc-webservice/pom.xml
#	dubbo-rpc/pom.xml
#	dubbo-simple/dubbo-monitor-simple/pom.xml
#	dubbo-simple/dubbo-registry-simple/pom.xml
#	dubbo-simple/pom.xml
#	dubbo-test/dubbo-test-benchmark/pom.xml
#	dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml
#	dubbo-test/dubbo-test-compatibility/pom.xml
#	dubbo-test/dubbo-test-examples/pom.xml
#	dubbo-test/dubbo-test-integration/pom.xml
#	dubbo-test/pom.xml
#	hessian-lite/pom.xml
#	pom.xml
2018-01-25 14:01:50 +08:00
ken.lj e9092612d7 Upgrade version to 2.5.9 2018-01-23 18:13:30 +08:00
qinliujie 9e8738b5ad Merge pull request #1189, enhance qos
Add property `qos.enable` to control telnet open/close
2018-01-18 01:17:32 -06:00
ken.lj 44138863ac Remove maven "provided" config in pom.xml of sub-modules 2018-01-12 16:14:58 +08:00
ken.lj da3783e3cd Upgrade version to 2.6.1 2018-01-11 17:35:11 +08:00
ken.lj 26f39d57ff Refactor project structure using maven 2018-01-11 15:41:44 +08:00
ken.lj 739a61e857 Upgrade version to 2.6.0 2018-01-05 15:35:57 +08:00
ken.lj 48661bc8e8 I18N effort for code base, translate the missing content 2017-12-27 16:03:11 +08:00
Ian Luo 0d1ef9b411 rename package name from CommandImpl to impl 2017-12-25 14:11:28 +08:00
Ian Luo d41e7225d0 #1104 I18N effort for dubbo code base - dubbo-plugin 2017-12-25 14:09:49 +08:00
ken.lj 55a68a337b Refactor package name 2017-12-12 21:51:21 +08:00
qinliujie e51c52f1fd Merge pull re
fix qos port can only configure by System property problem
2017-12-06 10:41:15 +08:00
qinliujie 49525b0a83 Merge pull request #982 from qinliujie:feat/refactor-telent-command
New Feature: expose maintenance command through Telnet and HTTP, only online and offline in this release.
2017-12-05 11:45:23 +08:00