Fury Zhu
|
01feb230a3
|
Merge pull request #855 from paderlol/develop
Nacos+MySQL8 startup error
|
2019-03-14 17:45:00 +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 |
|
zhanglong
|
3cb5089fd0
|
Refactor maven pom dependency and remove mysql jar from plugins dir
|
2019-03-03 17:48:24 +08:00 |
|
pader.zhang
|
2f0c503da1
|
Fix #852 #613
|
2019-03-02 11:50:59 +08:00 |
|
xuechaos
|
678fc8a5f7
|
update version get for pom
|
2019-02-28 17:34:25 +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 |
|
water.lyl
|
9947e8565c
|
change default user/password to nacos/nacos
|
2019-01-22 09:42:25 +08:00 |
|
nkorange
|
f2b43fb240
|
#502 Update author information
|
2019-01-19 21:23:35 +08:00 |
|
wuyoushan
|
938666c7b8
|
remove useless semicolon
|
2019-01-17 18:02:44 +08:00 |
|
wfnuser
|
973c522834
|
fix conflict
|
2019-01-15 12:48:28 +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
|
55c8f038e3
|
merge develop
|
2019-01-11 14:27:19 +08:00 |
|
Keep
|
21b7f96809
|
Merge pull request #446 from lostcharlie/develop
[ISSUE #442] Fix typos in class names and variables.
|
2019-01-11 14:19:43 +08:00 |
|
Keep
|
8fdbf685a8
|
Merge pull request #596 from fudali113/fix-get-remote-ip
Fixes #595
|
2019-01-09 20:35:17 +08:00 |
|
qingliang.ql
|
052901f27f
|
support java 6
|
2019-01-09 20:06:02 +08:00 |
|
fudali
|
8ef18cbe7a
|
fix: 添加新加测试文件授权头信息
|
2019-01-09 17:17:51 +08:00 |
|
fudali
|
0a229a7fcf
|
fix: 在获取客服端真实 ip 的方法中添加获取根据 X-Forwarded-For header 来进行获取的实现
|
2019-01-09 16:21:38 +08:00 |
|
fudali
|
9ac02e638b
|
feat: 获取客服端 ip 支持 X-Forwarded-For header
|
2019-01-09 16:13:31 +08:00 |
|
qingliang.ql
|
4101814db6
|
add license
|
2019-01-09 12:05:14 +08:00 |
|
qingliang.ql
|
fb5bbf3689
|
merge develop
|
2019-01-09 11:27:51 +08:00 |
|
qingliang.ql
|
4bcf4313e3
|
collect metrics to metrics monitor
|
2019-01-09 10:35:24 +08:00 |
|
qingliang.ql
|
d4821d6460
|
config metrics
|
2019-01-07 20:44:16 +08:00 |
|
FrankBian
|
41001899db
|
format code: add @Override; translate some chinese msg to english; remove unneccessary method modifier
|
2019-01-07 15:48:01 +08:00 |
|
water.lyl
|
f77dbd0e6d
|
Fix #381 format code, add license info
|
2019-01-06 21:55:59 +08:00 |
|
water.lyl
|
6ba58f24c0
|
Fix #381 persist user info
|
2019-01-04 15:46:55 +08:00 |
|
qingliang.ql
|
505252cb60
|
Fixes #395
|
2018-12-13 21:16:04 +08:00 |
|
Zhen Tang
|
6fb97c44e7
|
Revert changes in HTTP header for backward compatibility.
|
2018-12-13 09:13:51 +08:00 |
|
Zhen Tang
|
98e447e146
|
Fix typo: Long pulling -> Long polling.
|
2018-12-13 09:13:28 +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 |
|
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 |
|
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
|
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 |
|
hxy1991
|
0e24b70642
|
Fixes #316
|
2018-11-20 14:22:41 +08:00 |
|
hxy1991
|
9ab50bbc87
|
Fixes #255
|
2018-11-16 14:59:05 +08:00 |
|
hxy1991
|
af21897608
|
correct license
|
2018-11-16 10:28:28 +08:00 |
|
hxy1991
|
0d90d6e895
|
Fixes #222 #231
|
2018-11-07 18:20:09 +08:00 |
|
hxy1991
|
adc7ecfe48
|
Merge branch 'upstream-develop'
|
2018-11-05 18:29:23 +08:00 |
|
water.lyl
|
db8e97bd35
|
Fix #216
|
2018-11-05 15:45:36 +08:00 |
|
hxy1991
|
7c626eb4f8
|
Fixes #92
|
2018-11-02 18:26:24 +08:00 |
|
yanlinly
|
24a2ede65f
|
Merge pull request #194 from yanlinly/master
Fix #38 #106 #188
|
2018-10-31 09:39:22 +08:00 |
|
Keep
|
ede4111300
|
Merge pull request #152 from hxy1991/master
fixes #92
|
2018-10-30 21:16:09 +08:00 |
|
water.lyl
|
9d70f720ca
|
Fix #188
|
2018-10-30 15:55:06 +08:00 |
|
xuechaos
|
9275dd7c24
|
update copyright
|
2018-10-25 19:02:32 +08:00 |
|