得少
c279d31c10
Merge remote-tracking branch 'origin/develop' into support_ans_developer
...
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/identify/CredentialWatcher.java
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
2019-02-27 20:42:30 +08:00
得少
b3ee9698fa
#817
2019-02-22 17:06:02 +08:00
nkorange
451863fe33
Update version to 0.8.1
2019-02-15 11:54:10 +08:00
pbting
5e78e9a315
Merge branch 'feature_support_ans' into 0.8.0-poc-support-ans
2019-02-15 11:08:03 +08:00
pbting
15e0f30849
fix #367
2019-02-14 18:00:01 +08:00
pader.zhang
129e295aec
Fix #711
2019-01-30 17:40:16 +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
yanlinly
21c157f548
Merge pull request #673 from ankeway/hotfix_672
...
Hotfix 672
2019-01-22 10:57:51 +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
qingliang.ql
def3c196a1
add url
2019-01-18 14:24:53 +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
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
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
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
anjia0532
0c5654cec8
1. change charset to UTF-8(replace GBK or utf8)
...
2. support custom nacos server logs path in application* profile(key:nacos.logs.path)
2018-12-09 13:24:17 +08:00
xuechaos
d4edde980b
Nacos release 0.6.0 version
...
#388 Cluster name should be provided in the Instance
#377 Clean up messy code in Naming module
#369 Support instance list persisted on disk
#366 findbugs-maven-plugin version
#362 The metadata will lost when online or offline instance through web ui
#352 Refactoring internationalization Nacos console
#278 Nacos docker img
#243 optimize the efficiency of integration testing, it’s taking too long now
2018-12-07 15:19:43 +08:00
xuechaos
b39733e463
findbugs-maven-plugin version to 3.0.4
...
issue #366
2018-12-07 14:31:31 +08:00
nkorange
7d2f652b36
#187 Refactor selector
2018-12-06 20:14:07 +08:00
nkorange
aace49640a
#187 provide CMDB module
2018-12-05 12:08:49 +08:00
hxy1991
09f2da0382
Restore index names for compatibility
2018-11-28 10:23:04 +08:00
hxy1991
631d2e49a1
Merge branch 'upstream-master'
2018-11-20 16:30:42 +08:00
