nkorange
|
cd18124908
|
Merge branch 'feature_validate_service_format' into feature_naming_ap
# Conflicts:
# naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java
# naming/src/main/java/com/alibaba/nacos/naming/core/Instance.java
# naming/src/main/java/com/alibaba/nacos/naming/core/Service.java
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
|
2019-02-14 19:24:48 +08:00 |
|
nkorange
|
81dd9fbc6b
|
#745 Support service creation in AP mode
|
2019-02-12 20:11:57 +08:00 |
|
pader.zhang
|
129e295aec
|
Fix #711
|
2019-01-30 17:40:16 +08:00 |
|
nkorange
|
d3a4834672
|
#650 Server list manager detects healthy servers
|
2019-01-30 10:06:37 +08:00 |
|
nkorange
|
caf7213c2d
|
#502 Fix serialize problem and do some refactoring for health check
|
2019-01-27 22:50:41 +08:00 |
|
zhanglong
|
d302335508
|
Fix #711
|
2019-01-27 01:40:26 +08:00 |
|
water.lyl
|
f29209b114
|
release 0.8
|
2019-01-22 22:16:13 +08:00 |
|
nkorange
|
cd8f079609
|
Merge branch 'develop' into feature_naming_ap
# Conflicts:
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
|
2019-01-22 15:58:51 +08:00 |
|
yanlinly
|
21c157f548
|
Merge pull request #673 from ankeway/hotfix_672
Hotfix 672
|
2019-01-22 10:57:51 +08:00 |
|
nkorange
|
cc9b6b58b7
|
Merge branch 'develop' into feature_naming_ap
|
2019-01-22 10:13:22 +08:00 |
|
water.lyl
|
9947e8565c
|
change default user/password to nacos/nacos
|
2019-01-22 09:42:25 +08:00 |
|
ankeway
|
308bae547d
|
hotfix_672
|
2019-01-22 09:28:13 +08:00 |
|
nkorange
|
a72467e077
|
Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
# console/src/main/resources/META-INF/nacos-default.properties
# naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
|
2019-01-21 15:06:00 +08:00 |
|
nkorange
|
e9ddfd7e29
|
#502 Receive data sync
|
2019-01-21 14:28:59 +08:00 |
|
qingliang.ql
|
def3c196a1
|
add url
|
2019-01-18 14:24:53 +08:00 |
|
nkorange
|
d064fe36bb
|
Merge branch 'develop' into feature_naming_ap
|
2019-01-18 11:38:20 +08:00 |
|
nkorange
|
a889642ca9
|
Fix CMDB JVM option error in JDK 9
|
2019-01-18 10:57:44 +08:00 |
|
water.lyl
|
920ff30961
|
Fix HmacSHA256 not available，change -Djava.ext.dirs
|
2019-01-17 16:39:38 +08:00 |
|
water.lyl
|
fcbb582e53
|
1、Fix HmacSHA256 not available，change -Djava.ext.dirs
2、update jjwt to newest version
3、longger security key,and change hs512 to hs256
|
2019-01-16 22:54:51 +08:00 |
|
nkorange
|
425a80167b
|
Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
# naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
|
2019-01-15 18:15:55 +08:00 |
|
nkorange
|
e9811c84c6
|
Merge branch 'develop' into feature_multi_tenant
|
2019-01-15 14:55:59 +08:00 |
|
wfnuser
|
973c522834
|
fix conflict
|
2019-01-15 12:48:28 +08:00 |
|
nkorange
|
d0bfc0e179
|
Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
# naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
# naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
# naming/src/main/java/com/alibaba/nacos/naming/healthcheck/MysqlHealthCheckProcessor.java
# naming/src/main/java/com/alibaba/nacos/naming/healthcheck/TcpSuperSenseProcessor.java
# naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
# naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
|
2019-01-14 16:59:13 +08:00 |
|
nkorange
|
7abee38ff4
|
Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
# client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
# naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
# naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
# naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
# naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
# naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
|
2019-01-14 16:01:58 +08:00 |
|
nkorange
|
fdc48028fc
|
Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
# client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
# naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
# naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
# naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
# naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
# naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
|
2019-01-14 16:01:14 +08:00 |
|
water.lyl
|
78f3e44839
|
Fix #381 update mysql user table and security ignore url
|
2019-01-13 20:39:35 +08:00 |
|
nkorange
|
baa4b4c1f1
|
#502 Update pom version
|
2019-01-13 10:26:23 +08:00 |
|
nkorange
|
9898a3c8e4
|
Merge branch 'develop' into feature_multi_tenant
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
# naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java
# naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java
# naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java
# naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
# naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
# naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
# test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java
|
2019-01-11 14:08:13 +08:00 |
|
qingliang.ql
|
72f69902bc
|
tomcat access log
|
2019-01-09 16:02:34 +08:00 |
|
qingliang.ql
|
fb5bbf3689
|
merge develop
|
2019-01-09 11:27:51 +08:00 |
|
qingliang.ql
|
9debca5659
|
default close metrics
|
2019-01-09 11:02:44 +08:00 |
|
qingliang.ql
|
ef5fa53afa
|
console and configfile
|
2019-01-07 20:53:34 +08:00 |
|
nkorange
|
fed3c3f986
|
#498 Rename healthController bean and update pom version to 0.8.0-SNAPSHOT
|
2019-01-07 17:57:13 +08:00 |
|
nkorange
|
dda1bafb86
|
Fix #560
|
2019-01-04 14:16:15 +08:00 |
|
Fury Zhu
|
957d9823be
|
Merge pull request #559 from alibaba/hotfix_server_side_check_lose_data
#558 Add access log setting
|
2019-01-03 17:16:48 +08:00 |
|
nkorange
|
5e244a7316
|
#558 Add access log setting
|
2019-01-03 16:49:57 +08:00 |
|
Fury Zhu
|
35e6daf948
|
Merge pull request #538 from canglang1973/master
translate javadoc to English.
|
2019-01-03 12:26:11 +08:00 |
|
nkorange
|
3250533516
|
#526 Make more effort
|
2018-12-29 13:44:12 +08:00 |
|
nkorange
|
c56947c692
|
Fix windows startup error
|
2018-12-20 15:10:18 +08:00 |
|
nkorange
|
64f29ddd78
|
#187 Add label dump task
|
2018-12-18 16:03:26 +08:00 |
|
nkorange
|
b35b483e87
|
Add plugin directory
|
2018-12-14 20:48:26 +08:00 |
|
nkorange
|
dc3d95d055
|
Disable CMDB by default
|
2018-12-14 20:25:53 +08:00 |
|
nkorange
|
be64c1acf7
|
Update version to 0.7.0
|
2018-12-14 17:48:57 +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 |
|
qingliang.ql
|
505252cb60
|
Fixes #395
|
2018-12-13 21:16:04 +08:00 |
|
nkorange
|
f96794e170
|
#187 Fix bug
|
2018-12-13 20:01:07 +08:00 |
|
nkorange
|
5f6bdf2d39
|
Update expression syntax
|
2018-12-13 15:12:57 +08:00 |
|
hxy1991
|
ff55be27d3
|
Merge branch 'anjia0532-master' into upstream-develop
# Conflicts:
# console/src/main/resources/diamond-server-logback.xml
|
2018-12-11 19:17:43 +08:00 |
|
hxy1991
|
97743685ac
|
Fixes #363
|
2018-12-10 19:53:15 +08:00 |
|
nkorange
|
3198ec69ca
|
#187 Refactor some logic
|
2018-12-10 15:37:48 +08:00 |
|