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
|
5711ace91f
|
function mode server code completed
|
2019-02-27 20:00:05 +08:00 |
|
nkorange
|
81dd9fbc6b
|
#745 Support service creation in AP mode
|
2019-02-12 20:11:57 +08:00 |
|
nkorange
|
caf7213c2d
|
#502 Fix serialize problem and do some refactoring for health check
|
2019-01-27 22:50:41 +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 |
|
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 |
|
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 |
|
water.lyl
|
78f3e44839
|
Fix #381 update mysql user table and security ignore url
|
2019-01-13 20:39:35 +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
|
5e244a7316
|
#558 Add access log setting
|
2019-01-03 16:49:57 +08:00 |
|
nkorange
|
3250533516
|
#526 Make more effort
|
2018-12-29 13:44:12 +08:00 |
|
nkorange
|
64f29ddd78
|
#187 Add label dump task
|
2018-12-18 16:03:26 +08:00 |
|
nkorange
|
dc3d95d055
|
Disable CMDB by default
|
2018-12-14 20:25:53 +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 |
|
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 |
|
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
|
94dd0e5609
|
Merge branch 'upstream-master'
|
2018-11-20 14:02:40 +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 |
|
hxy1991
|
9ab50bbc87
|
Fixes #255
|
2018-11-16 14:59:05 +08:00 |
|
nkorange
|
46c141900e
|
Fix PMD
|
2018-11-16 12:07:25 +08:00 |
|
hxy1991
|
7a3e9fd17b
|
Fixes #222
|
2018-11-15 22:45:53 +08:00 |
|
hxy1991
|
72b298e872
|
Fixes #196
|
2018-11-05 20:29:45 +08:00 |
|
nkorange
|
bbc3c24226
|
Use HTTP redirect instead of resend request
|
2018-11-05 17:09:00 +08:00 |
|
nkorange
|
6466218baf
|
Raft performance improved.
|
2018-10-29 20:34:12 +08:00 |
|
nkorange
|
f4e8684fdf
|
Fix #149
|
2018-10-24 17:54:34 +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 |
|
mercyblitz
|
8a73c805d8
|
Polish alibaba/nacos#110 : remove application.properties and copy to META-INF/nacos-default.properties
|
2018-10-03 01:18:09 +08:00 |
|
mercyblitz
|
c4374dbf4e
|
Polish alibaba/nacos#94 : fixed the grammar of logback xml files
|
2018-10-02 18:21:54 +08:00 |
|
nkorange
|
af35525850
|
Merge branch 'master' into 0.3.0
Conflicts:
console/src/main/resources/static/.gitignore
console/src/main/resources/static/.webpackrc
console/src/main/resources/static/README.md
console/src/main/resources/static/i18ndoc.js
console/src/main/resources/static/index.js
console/src/main/resources/static/package.json
console/src/main/resources/static/public/i18ndoc.js
console/src/main/resources/static/src/components/EditorNameSpace.js
console/src/main/resources/static/src/components/NameSpaceList.js
console/src/main/resources/static/src/components/NewNameSpace.js
console/src/main/resources/static/src/components/ValidateDialog.js
console/src/main/resources/static/src/menu.js
console/src/main/resources/static/src/pages/Configeditor.js
console/src/main/resources/static/src/pages/ConfigurationManagement.js
console/src/main/resources/static/src/pages/Namespace.js
console/src/main/resources/static/src/router.js
|
2018-09-28 10:29:11 +08:00 |
|
water.lyl
|
fc44a1264b
|
[motify info] update namespace config
|
2018-09-27 22:54:19 +08:00 |
|
water.lyl
|
9839062d32
|
Fix #67
The configuration module log is changed to config
|
2018-09-19 19:15:54 +08:00 |
|
water.lyl
|
b9cd75b640
|
Fix #65
Nacos default port changed from 8080 to 8848
|
2018-09-19 19:06:03 +08:00 |
|
xuechaos
|
cc33ccd1ad
|
add mysql sql file
|
2018-07-30 23:05:11 +08:00 |
|
xingxuechao
|
91d20f34fd
|
nacos is coming
|
2018-07-21 00:27:23 +08:00 |
|