xuechaos
|
3ab06bc1dd
|
Merge branch 'develop' of https://github.com/alibaba/nacos into develop
|
2018-12-07 14:30:11 +08:00 |
|
王彦民
|
baa79164e2
|
fix: closes #353
|
2018-12-07 14:11:52 +08:00 |
|
nkorange
|
0409aaecb0
|
#187 Add Java docs
|
2018-12-07 11:24:22 +08:00 |
|
nkorange
|
7d2f652b36
|
#187 Refactor selector
|
2018-12-06 20:14:07 +08:00 |
|
mingyixu
|
ea1e8ab9dc
|
Merge pull request #394 from mingyixu/master
[ISSUE #243]fix Integration testing too long
|
2018-12-06 19:42:29 +08:00 |
|
zhichen
|
9425a53124
|
Merge pull request #355 from jameslcj/hotfix_337
validate config syntax #337
|
2018-12-06 15:20:00 +08:00 |
|
xxc
|
f431291e69
|
Merge branch 'master' into develop
|
2018-12-06 15:02:07 +08:00 |
|
王彦民
|
2ef2e5a5c6
|
fix: closes #362
|
2018-12-06 11:01:42 +08:00 |
|
xxc
|
91dca4a3b9
|
Merge pull request #398 from hxy1991/master
Fixes #391 Fixes #229
|
2018-12-06 11:01:11 +08:00 |
|
zhichen
|
52fe7d52c1
|
Merge branch 'develop' into hotfix_337
|
2018-12-06 10:38:21 +08:00 |
|
hxy1991
|
1ca774b42c
|
Fixes #391
|
2018-12-05 22:50:52 +08:00 |
|
hxy1991
|
25819dce28
|
Fixes #229
|
2018-12-05 22:36:33 +08:00 |
|
hxy1991
|
6deb418c36
|
Fixes #391
|
2018-12-05 21:41:03 +08:00 |
|
hxy1991
|
190ac8d057
|
Fixes #391
|
2018-12-05 20:33:50 +08:00 |
|
mingyixu
|
c634ff8da2
|
[ISSUE #243]fix Integration testing too long
|
2018-12-05 18:56:34 +08:00 |
|
mingyixu
|
e15e902975
|
[ISSUE #243]fix Integration testing too long
|
2018-12-05 17:29:48 +08:00 |
|
JianweiWang
|
3f5955f69c
|
Merge pull request #392 from alibaba/hotfix_cluster_lost_in_instance
Hotfix cluster lost in instance
|
2018-12-05 17:08:48 +08:00 |
|
nkorange
|
baf7d61a70
|
#388 Add test case.
|
2018-12-05 15:16:43 +08:00 |
|
nkorange
|
cce2679670
|
Fix #388
|
2018-12-05 14:11:03 +08:00 |
|
nkorange
|
aace49640a
|
#187 provide CMDB module
|
2018-12-05 12:08:49 +08:00 |
|
nkorange
|
3ae5e20898
|
#387 refactor service operate url
|
2018-12-05 12:07:29 +08:00 |
|
Keep
|
f309d2ecb1
|
Merge pull request #296 from hxy1991/master
Fixes #255 #363
|
2018-12-04 10:30:35 +08:00 |
|
王彦民
|
3d59322721
|
fix: remove console log && closes #352
|
2018-12-03 19:08:47 +08:00 |
|
王彦民
|
40d333d529
|
refactor: Language switching
|
2018-12-03 19:08:47 +08:00 |
|
王彦民
|
91d0052563
|
fix: NewConfig internationalization
|
2018-12-03 19:08:47 +08:00 |
|
王彦民
|
941469af7f
|
fix: HistoryDetail internationalization
|
2018-12-03 19:08:47 +08:00 |
|
王彦民
|
d487f522b6
|
fix: HistoryRollback internationalization
|
2018-12-03 19:08:47 +08:00 |
|
王彦民
|
4f419b0058
|
fix: ListeningToQuery internationalization
|
2018-12-03 19:08:47 +08:00 |
|
王彦民
|
3a5bec51cd
|
fix: ServiceManagement internationalization
|
2018-12-03 19:08:47 +08:00 |
|
王彦民
|
74e72a8664
|
Fixed language
|
2018-12-03 19:08:47 +08:00 |
|
王彦民
|
4a0ce8e331
|
fix: Language switch
|
2018-12-03 19:08:47 +08:00 |
|
nkorange
|
78523976ba
|
#97 Support integrating to third-party CMDB to filter service providers by their labels.
|
2018-12-03 17:56:11 +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 |
|
nkorange
|
67ebd02408
|
Merge branch 'develop' into feature_cmdb
|
2018-12-03 09:52:32 +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 |
|