nkorange
|
c7100e25f8
|
Fix conflict
|
2018-11-16 20:33:05 +08:00 |
|
nkorange
|
93246b3ded
|
Merge branch 'naming-model-refactor' into develop
# Conflicts:
# console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js
# console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
# naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
|
2018-11-16 19:59:15 +08:00 |
|
Fury Zhu
|
ea03905ae9
|
Merge branch 'master' into naming-model-refactor
|
2018-11-16 18:16:51 +08:00 |
|
nkorange
|
46c141900e
|
Fix PMD
|
2018-11-16 12:07:25 +08:00 |
|
hxy1991
|
af21897608
|
correct license
|
2018-11-16 10:28:28 +08:00 |
|
nkorange
|
eba3ca9c74
|
Fix ip registered failed bug
|
2018-11-15 15:25:45 +08:00 |
|
nkorange
|
361ae0b2dd
|
Fix raft publish bug
|
2018-11-15 14:19:08 +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 |
|
Fury Zhu
|
724ced4861
|
Merge pull request #213 from paderlol/develop
Fixes #193
|
2018-11-11 23:08:01 +08:00 |
|
zhanglong
|
d60c03edcd
|
support domain for server cluster into k8s
|
2018-11-11 15:15:09 +08:00 |
|
nkorange
|
24485abcf9
|
Fix #249
|
2018-11-08 21:28:20 +08:00 |
|
nkorange
|
8fe38f7dcb
|
Fix #249
|
2018-11-08 21:24:50 +08:00 |
|
nkorange
|
6aaae5d95f
|
Call local method instead of sending HTTP request to localhost
|
2018-11-08 19:50:34 +08:00 |
|
nkorange
|
d3751a99af
|
#209 Disable service and cluster level customization in client
|
2018-11-08 16:34:18 +08:00 |
|
hxy1991
|
0d90d6e895
|
Fixes #222 #231
|
2018-11-07 18:20:09 +08:00 |
|
nkorange
|
d6f4834688
|
Separate locked publish from unlocked publish
|
2018-11-07 11:28:46 +08:00 |
|
Fury Zhu
|
bdc3026798
|
Merge pull request #198 from alibaba/hotfix_update_service_error
Fix #197
|
2018-11-07 10:11:42 +08:00 |
|
Fury Zhu
|
3cbcbe94c0
|
Merge pull request #220 from nanamikon/master
PUT /instance should use param key "useIPPort4Check" instead of "userIPPort4Check"
|
2018-11-06 11:42:27 +08:00 |
|
nkorange
|
c348398d45
|
Fix #168
|
2018-11-06 09:45:07 +08:00 |
|
nkorange
|
db2a6498b6
|
Fix #181
|
2018-11-05 20:42:14 +08:00 |
|
water.lyl
|
7fdd80cc31
|
update version to 0.4.0
|
2018-11-05 20:34:37 +08:00 |
|
kaitai.zj
|
1a4c0e0550
|
bug fix: The key in the com.alibaba.nacos.api.naming.pojo.Cluster is "useIPPort4Check" instead of "userIPPort4Check"
|
2018-11-05 18:20:23 +08:00 |
|
nkorange
|
bbc3c24226
|
Use HTTP redirect instead of resend request
|
2018-11-05 17:09:00 +08:00 |
|
zhanglong
|
713fe2e635
|
Merge branch 'develop' of https://github.com/paderlol/nacos into develop
|
2018-11-03 16:10:20 +08:00 |
|
zhanglong
|
1f6271e1a1
|
support hostname for server cluster
|
2018-11-03 16:08:14 +08:00 |
|
nkorange
|
a020bcd783
|
#177 Finish backend.
|
2018-10-31 21:16:55 +08:00 |
|
nkorange
|
50be11d0ef
|
Fix #197
|
2018-10-31 15:48:24 +08:00 |
|
xxc
|
eab2110033
|
Merge pull request #192 from alibaba/hotfix-clientbeat-lose-info
Fix #190
|
2018-10-31 15:30:17 +08:00 |
|
nkorange
|
ad36fba84b
|
Enable default TTL
|
2018-10-31 15:21:15 +08:00 |
|
nkorange
|
4ff38aca3a
|
Differentiate temporary data and persistent data
|
2018-10-31 10:48:15 +08:00 |
|
nkorange
|
3e01285ab7
|
Merge branch 'hotfix-clientbeat-lose-info' into raft-performance
|
2018-10-30 20:11:30 +08:00 |
|
nkorange
|
dc7cb2bdee
|
Fix #190
|
2018-10-30 17:59:05 +08:00 |
|
nkorange
|
aa7e2e41e7
|
remove ip use weak raft
|
2018-10-30 16:16:01 +08:00 |
|
nkorange
|
ceb2787944
|
Merge branch 'hotfix-register-hangs' into raft-performance
# Conflicts:
# api/pom.xml
# client/pom.xml
# common/pom.xml
# config/pom.xml
# console/pom.xml
# core/pom.xml
# distribution/pom.xml
# example/pom.xml
# naming/pom.xml
# pom.xml
# test/pom.xml
|
2018-10-30 08:54:50 +08:00 |
|
nkorange
|
ebb5cddd84
|
Not remove lock
|
2018-10-29 22:34:44 +08:00 |
|
nkorange
|
25f219623c
|
Fix #150
|
2018-10-29 21:25:53 +08:00 |
|
nkorange
|
6466218baf
|
Raft performance improved.
|
2018-10-29 20:34:12 +08:00 |
|
xuechaos
|
077c4cdb6f
|
release Nacos 0.3.0, update version to 0.3.0
|
2018-10-26 21:55:05 +08:00 |
|
xuechaos
|
9275dd7c24
|
update copyright
|
2018-10-25 19:02:32 +08:00 |
|
nkorange
|
abdc48fc84
|
Fix register instance with customized cluster name failed bug.
|
2018-10-25 15:56:02 +08:00 |
|
nkorange
|
855037cac6
|
Fix client side health check error
|
2018-10-25 13:22:22 +08:00 |
|
wyp12
|
1cf0a5b731
|
Merge remote-tracking branch 'origin/hotfix-clientbeat-failed' into feature_ServiceMesh
|
2018-10-24 18:00:02 +08:00 |
|
nkorange
|
f4e8684fdf
|
Fix #149
|
2018-10-24 17:54:34 +08:00 |
|
nkorange
|
e3276d0114
|
Fix #150
|
2018-10-24 17:52:55 +08:00 |
|
wyp12
|
4da7557620
|
add enable
|
2018-10-24 11:17:47 +08:00 |
|
wyp12
|
5cc9137d66
|
update
|
2018-10-23 14:56:26 +08:00 |
|
xuechaos
|
1fbcf24521
|
update 0.3.0-RC1 uppercase letter
|
2018-10-19 18:36:29 +08:00 |
|
nkorange
|
6da8bf89fc
|
Resolve conflicts and fix log error
|
2018-10-18 22:23:26 +08:00 |
|
nkorange
|
534995a405
|
Resolve conflicts
|
2018-10-18 18:59:45 +08:00 |
|
nkorange
|
baa8594fe7
|
Merge branch 'master' into 0.3.0
# Conflicts:
# api/pom.xml
# config/pom.xml
# config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
# console/pom.xml
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
# naming/src/main/resources/application.properties
|
2018-10-18 17:11:32 +08:00 |
|