Commit Graph

49 Commits

Author SHA1 Message Date
nkorange
38644f5e73 Fix #2020 2019-12-06 15:04:37 +08:00
黄大相
31a59e8451 fix 2025 2019-11-21 16:19:51 +08:00
nkorange
c431a852b5 #2018 Close inpuststream instead of connection. 2019-11-07 16:02:01 +08:00
ly
5d428a2366 [ISSUE] #1671 Unified request header "Client-Version" 2019-08-23 00:50:56 +08:00
ly
3b4767384d [ISSUE] #1671 Unified request header "Client-Version" 2019-08-23 00:02:00 +08:00
Fury Zhu
838ef83f9f
Merge pull request #1534 from zhaoyuguang/zen3
format code
2019-08-01 11:04:24 +08:00
赵禹光
8320701f2e fmt 2019-07-11 20:27:59 +08:00
赵禹光
ce1ebeb85c fmt 2019-07-11 20:20:21 +08:00
ly
a87f0bd2bb Fix #1519 The subscriber list is not displayed correctly 2019-07-11 01:48:11 +08:00
slievrly
8d74ac90aa optimize array and negated codestyle 2019-06-19 22:35:52 +08:00
IanCao
a98db447fe format code 2019-06-13 12:26:22 +08:00
SLKun
ce0b863e47 fixes #827 2019-04-04 11:37:16 +08:00
xuechaos
9b7d61356a update versionUtils in stream close 2019-03-29 20:08:44 +08:00
nkorange
616a8031bc Merge branch 'develop' into feature_naming_group
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/conf/application.properties
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	pom.xml
#	test/pom.xml
2019-03-04 10:12:11 +08:00
xuechaos
ff51baae1c add lisence 2019-02-28 18:41:29 +08:00
xuechaos
678fc8a5f7 update version get for pom 2019-02-28 17:34:25 +08:00
xuechaos
5711ace91f function mode server code completed 2019-02-27 20:00:05 +08:00
nkorange
493715973f Merge branch 'develop' into feature_naming_group
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2019-02-26 17:29:22 +08:00
hxy1991
0e9d3e678a Fixes #240 #826 #827 #828 2019-02-26 14:22:38 +08:00
qingliang.ql
eb87625083 fetch self ip 2019-02-22 16:24:26 +08:00
nkorange
cc9b6b58b7 Merge branch 'develop' into feature_naming_ap 2019-01-22 10:13:22 +08:00
nkorange
1e9d9e2a85 Fix HTTP method value error 2019-01-22 10:08:49 +08:00
nkorange
f2b43fb240 #502 Update author information 2019-01-19 21:23:35 +08:00
nkorange
260332bc7e #498 Fix method type error 2019-01-09 14:21:02 +08:00
nkorange
947e0439b0 #269 Register instance with tenant info 2018-12-19 11:02:31 +08:00
nkorange
7fac0909d4 Fix build error 2018-12-14 22:47:09 +08:00
nkorange
d2e4f4e6b4 Merge branch 'feature_cmdb' into 0.7.0
# Conflicts:
#	api/pom.xml
#	api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/conf/application.properties
#	distribution/conf/nacos-logback.xml
#	distribution/pom.xml
#	distribution/release-nacos.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	pom.xml
#	test/pom.xml
2018-12-14 17:15:32 +08:00
nkorange
7a64ce2177 #187 Fix bug 2018-12-14 17:00:18 +08:00
nkorange
78523976ba #97 Support integrating to third-party CMDB to filter service providers by their labels. 2018-12-03 17:56:11 +08:00
hxy1991
cbc8b0a75a Merge branch 'upstream-develop'
# Conflicts:
#	api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java
2018-12-03 10:29:40 +08:00
hxy1991
30e7c5273a Fixes #363 2018-12-01 13:57:03 +08:00
nkorange
e3e6682231 Modify author info 2018-11-30 13:25:58 +08:00
hxy1991
af21897608 correct license 2018-11-16 10:28:28 +08:00
hxy1991
de4a523318 Fixes #272 2018-11-14 12:02:19 +08:00
yanlinly
30919083e8
Merge pull request #247 from hxy1991/master
[ISSUE #222] [ISSUE #231] [ISSUE #246]
2018-11-12 10:49:32 +08:00
hxy1991
0d90d6e895 Fixes #222 #231 2018-11-07 18:20:09 +08:00
zhanglong
1f6271e1a1 support hostname for server cluster 2018-11-03 16:08:14 +08:00
nkorange
534995a405 Resolve conflicts 2018-10-18 18:59:45 +08:00
mercyblitz
08af83caac Polish alibaba/nacos#95 : more generic implementation 2018-10-02 12:22:18 +08:00
mercyblitz
adaf5f54d1 Polish alibaba/nacos#95 : add "standalone" profile 2018-10-02 11:20:54 +08:00
mercyblitz
64c6189ccb Polish alibaba/nacos#105 : add test cases 2018-10-01 23:10:21 +08:00
mercyblitz
c0a25c148a Polish alibaba/nacos#105 2018-10-01 22:54:37 +08:00
mercyblitz
dc7a4eaa85 Polish alibaba/nacos#102 2018-10-01 11:34:36 +08:00
mercyblitz
a718c84d4c Polish alibaba/nacos#104 2018-10-01 10:48:34 +08:00
mercyblitz
b0b7146a86 Remove unused class 2018-10-01 10:30:24 +08:00
xuechaos
d24f8680d9 fix mvn -B clean apache-rat:check
close #79
2018-09-26 20:05:17 +08:00
xuechaos
b5fe4fd434 client jdk support 1.6 and del unuse file 2018-09-19 22:18:31 +08:00
nkorange
84df9affb7 Fix #35 2018-08-31 07:46:43 +08:00
xingxuechao
91d20f34fd nacos is coming 2018-07-21 00:27:23 +08:00