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 |
|
JianweiWang
|
be0ba62bbd
|
Merge pull request #378 from alibaba/feature_debug_log
#377 Clean up code
|
2018-12-02 18:00:36 +08:00 |
|
nkorange
|
5f60644d9e
|
#377 Clean up code
|
2018-12-02 17:40:06 +08:00 |
|
JianweiWang
|
0f0cbd2e43
|
Merge pull request #376 from alibaba/feature_iplist_persist
Feature iplist persist
|
2018-12-02 16:39:53 +08:00 |
|
hxy1991
|
30e7c5273a
|
Fixes #363
|
2018-12-01 13:57:03 +08:00 |
|
hxy1991
|
b3dcd9f91a
|
Merge branch 'upstream-develop'
|
2018-12-01 11:55:32 +08:00 |
|
nkorange
|
75d9d24345
|
#369 Update property name
|
2018-11-30 22:35:43 +08:00 |
|
xxc
|
0a1d949fd4
|
Update README.md
update version to 0.5.0 release
|
2018-11-30 22:14:55 +08:00 |
|
nkorange
|
e3e6682231
|
Modify author info
|
2018-11-30 13:25:58 +08:00 |
|
nkorange
|
c2672953d2
|
#369 Instance list persisted on disk if enabled.
|
2018-11-30 13:24:03 +08:00 |
|
Fury Zhu
|
6c7e9ff858
|
Merge pull request #368 from alibaba/hotfix_decide_leader_bug
Fix #357
|
2018-11-29 16:57:58 +08:00 |
|
wfnuser
|
9d8db9799d
|
remove the unexpected padding of editor.
|
2018-11-29 15:11:43 +08:00 |
|
wfnuser
|
01a067be42
|
remove balloons in configuration management page
|
2018-11-29 15:11:43 +08:00 |
|
Fury Zhu
|
79745783e9
|
Merge pull request #361 from alibaba/hotfix_decide_leader_bug
Fix #357
|
2018-11-28 17:38:35 +08:00 |
|
nkorange
|
44cb206794
|
Fix #357
|
2018-11-28 15:47:21 +08:00 |
|
hxy1991
|
09f2da0382
|
Restore index names for compatibility
|
2018-11-28 10:23:04 +08:00 |
|
hxy1991
|
e7dff10627
|
Merge branch 'upstream-develop'
|
2018-11-28 10:11:17 +08:00 |
|
zhichen
|
626b41c859
|
format code
|
2018-11-28 10:01:59 +08:00 |
|
zhichen
|
be3fa66e2d
|
format code
|
2018-11-28 09:59:53 +08:00 |
|
zhichen
|
00d660b0eb
|
validate config syntax fix #337
|
2018-11-27 16:30:08 +08:00 |
|
Keep
|
ccea92e634
|
Merge pull request #340 from liaozan/patch-1
fix typo
|
2018-11-24 20:17:55 +08:00 |
|
liaozan
|
98ec99d84d
|
fix typo
|
2018-11-24 13:16:38 +08:00 |
|
zhichen
|
953dc5e32e
|
Merge pull request #331 from jameslcj/feature_compress_js
removed redundant js and css
|
2018-11-23 11:19:31 +08:00 |
|
Fury Zhu
|
2be8c3984a
|
Merge pull request #330 from ethonchen/develop
[ISSUE #325] Fix localhostIp error when set -Dnacos.preferHostnameOverIp=true
|
2018-11-22 20:52:02 +08:00 |
|
hxy1991
|
17990b01a2
|
Merge branch 'upstream-develop'
|
2018-11-22 15:16:22 +08:00 |
|
zhichen
|
5f4e149b00
|
remove redundant js
|
2018-11-22 14:29:48 +08:00 |
|
zhichen
|
c077c385f0
|
rewrite url #321
|
2018-11-21 17:47:01 +08:00 |
|
ethon
|
fb1cf6fcec
|
bugfix, when -Dnacos.preferHostnameOverIp=true , the localhostIp error . bug #325
|
2018-11-21 17:33:00 +08:00 |
|
zhichen
|
46648dbdce
|
[ISSUE 321]Merge pull request #324 from jameslcj/hotfix_321
fix #321
|
2018-11-21 13:57:41 +08:00 |
|
zhichen
|
7d0bef5342
|
fix #321
|
2018-11-21 11:25:19 +08:00 |
|
zhichen
|
d958bd60e3
|
Merge pull request #319 from jameslcj/feature_console_add_webpack_hot
webpack adds hot dev mode
|
2018-11-20 16:30:56 +08:00 |
|
hxy1991
|
631d2e49a1
|
Merge branch 'upstream-master'
|
2018-11-20 16:30:42 +08:00 |
|
zhichen
|
227a5154fe
|
udpate: add some fe files to rat config
|
2018-11-20 15:18:29 +08:00 |
|
Keep
|
5f5a520b95
|
Merge pull request #318 from alibaba/master
Merge branch 'master' into develop
|
2018-11-20 15:14:43 +08:00 |
|
zhichen
|
646e5bf9fa
|
feature: webpack adds hot dev mode
|
2018-11-20 14:39:46 +08:00 |
|
Keep
|
9fafcda744
|
Merge pull request #317 from hxy1991/hotfix_316
Fixes #316
|
2018-11-20 14:39:29 +08:00 |
|
hxy1991
|
0e24b70642
|
Fixes #316
|
2018-11-20 14:22:41 +08:00 |
|
hxy1991
|
94dd0e5609
|
Merge branch 'upstream-master'
|
2018-11-20 14:02:40 +08:00 |
|
xuechaos
|
67107d8b08
|
Merge branch 'hotfix_gclog' into develop
|
2018-11-20 13:47:23 +08:00 |
|
xxc
|
2dacfd69c0
|
Merge pull request #315 from alibaba/hotfix_gclog
fix : GC log does not take effect
|
2018-11-20 11:52:50 +08:00 |
|
xuechaos
|
dc8d44597f
|
fix : GC log does not take effect
issue ##314
|
2018-11-20 11:03:25 +08:00 |
|
zhichen
|
84b9dd6e77
|
[issues #294]Merge pull request #305
FE Scaffold reconstruction, #294
|
2018-11-20 09:58:38 +08:00 |
|
Fury Zhu
|
75309260eb
|
Merge pull request #313 from alibaba/hotfix_hide_mvnrepo
Hotfix hide mvnrepo
|
2018-11-20 09:15:08 +08:00 |
|
Fury Zhu
|
fb363d9ba6
|
Merge pull request #312 from alibaba/hotfix_hide_mvnrepo
Hide mvn repository config
|
2018-11-20 09:13:24 +08:00 |
|
nkorange
|
62352515d9
|
Hide mvn repository config
|
2018-11-20 09:12:20 +08:00 |
|
Fury Zhu
|
0fb3f9562e
|
Merge pull request #311 from alibaba/develop
0.5.0 release
|
2018-11-19 19:59:41 +08:00 |
|
dungu.zpf
|
d795ad7d2b
|
0.5.0 release
|
2018-11-19 19:54:08 +08:00 |
|
Fury Zhu
|
e773ef26a5
|
Merge pull request #309 from alibaba/develop
Develop
|
2018-11-19 17:38:40 +08:00 |
|
JianweiWang
|
2a41553913
|
Merge pull request #308 from alibaba/hotfix_log_print
Hotfix log print
|
2018-11-19 17:29:07 +08:00 |
|
nkorange
|
807c7dc153
|
Fix raft publish unstable problem.
|
2018-11-19 16:58:19 +08:00 |
|