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 |
|
qingliang.ql
|
55c8f038e3
|
merge develop
|
2019-01-11 14:27:19 +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 |
|
zhichen
|
9789e13bf6
|
fix #499
|
2019-01-10 15:14:51 +08:00 |
|
zhichen
|
b464ce193e
|
fix #499
|
2019-01-10 15:13:37 +08:00 |
|
zhichen
|
3e02d0d595
|
fix #499
|
2019-01-10 15:02:58 +08:00 |
|
王彦民
|
829f538e9f
|
refactor: clean code && Upgrade
|
2019-01-10 14:06:29 +08:00 |
|
王彦民
|
5d6085fcee
|
refactor: ConfigRollback i18n #474
|
2019-01-09 15:17:59 +08:00 |
|
王彦民
|
f2f11327c2
|
refactor: ConfigDetail i18n #474
|
2019-01-09 13:15:18 +08:00 |
|
qingliang.ql
|
fb5bbf3689
|
merge develop
|
2019-01-09 11:27:51 +08:00 |
|
王彦民
|
fa57fa053d
|
refactor: NameSpaceList i18n #474
|
2019-01-08 14:24:46 +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 |
|
王彦民
|
27ca776525
|
Update fe build
|
2019-01-06 09:56:24 +08:00 |
|
王彦民
|
5483e733c3
|
refactor: NewNameSpace i18n #474
|
2019-01-06 09:56:24 +08:00 |
|
王彦民
|
031863e1ca
|
Update fe build
|
2019-01-05 19:13:28 +08:00 |
|
王彦民
|
b36dc44868
|
refactor: ConfigSync i18n #474
|
2019-01-05 19:13:28 +08:00 |
|
王彦民
|
54e69f01bc
|
refactor: SuccessDialog i18n #474
|
2019-01-03 17:39:20 +08:00 |
|
Fury Zhu
|
35e6daf948
|
Merge pull request #538 from canglang1973/master
translate javadoc to English.
|
2019-01-03 12:26:11 +08:00 |
|
leitao1
|
fd31408ddd
|
translate javadoc to English.
|
2018-12-29 09:39:48 +08:00 |
|
王彦民
|
07bfb68c06
|
refactor: ShowCodeing i18n #474 && fe build
|
2018-12-28 16:41:52 +08:00 |
|
王彦民
|
404e488a72
|
refactor: ImportDialog i18n #474
|
2018-12-28 16:41:52 +08:00 |
|
王彦民
|
6a3370e2fd
|
refactor: ExportDialog i18n #474
|
2018-12-25 18:16:36 +08:00 |
|
王彦民
|
d6cb0423a4
|
refactor: EditorNameSpace i18n #474
|
2018-12-25 10:50:43 +08:00 |
|
王彦民
|
a2d6eac728
|
refactor: DiffEditorDialog, ConfigEditor i18n #474
|
2018-12-24 22:26:20 +08:00 |
|
王彦民
|
79f73ff17c
|
refactor: DeleteDialog i18n #474
|
2018-12-23 20:39:04 +08:00 |
|
王彦民
|
b6491cc25c
|
refactor: CloneDialog internationalization
|
2018-12-22 20:10:39 +08:00 |
|
nkorange
|
64f29ddd78
|
#187 Add label dump task
|
2018-12-18 16:03:26 +08:00 |
|
nkorange
|
109a196dce
|
Merge branch 'develop' into 0.7.0
|
2018-12-14 21:15:58 +08:00 |
|
zhichen
|
fb72fa8098
|
build js
|
2018-12-14 21:05:04 +08:00 |
|
zhichen
|
8e6e6f0362
|
Merge branch 'develop' of https://github.com/alibaba/nacos into develop
|
2018-12-14 21:01:53 +08:00 |
|
zhichen
|
135056057c
|
update: the console version
|
2018-12-14 21:01:33 +08:00 |
|
nkorange
|
71f1d946fd
|
Merge branch 'develop' into 0.7.0
|
2018-12-14 20:52:00 +08:00 |
|
zhichen
|
6e1074e721
|
build js
|
2018-12-14 20:49:07 +08:00 |
|
zhichen
|
a656519794
|
change service remove url #393
|
2018-12-14 20:45:01 +08:00 |
|
nkorange
|
d3a164ca8b
|
Merge branch 'develop' into 0.7.0
|
2018-12-14 20:28:23 +08:00 |
|
zhichen
|
a95f623f33
|
resolve conflict
|
2018-12-14 20:24:04 +08:00 |
|
zhichen
|
fd3d3d8491
|
fix request params pattern #393
|
2018-12-14 20:19:16 +08:00 |
|
nkorange
|
ffa9f92812
|
Merge branch 'develop' into 0.7.0
|
2018-12-14 20:02:37 +08:00 |
|
Fury Zhu
|
5d08a7b61f
|
Merge pull request #465 from jameslcj/hotfix_393
fix #393
|
2018-12-14 20:01:47 +08:00 |
|
nkorange
|
1a72cbeff9
|
Update default property
|
2018-12-14 19:59:59 +08:00 |
|
zhichen
|
2bacedf58a
|
fix #393
|
2018-12-14 19:55:33 +08:00 |
|
zhichen
|
608935d08d
|
resolve conflict
|
2018-12-14 19:34:03 +08:00 |
|
nkorange
|
be64c1acf7
|
Update version to 0.7.0
|
2018-12-14 17:48:57 +08:00 |
|
zhichen
|
d8291244e9
|
fix: #455
|
2018-12-13 21:17:00 +08:00 |
|
zhichen
|
abf4f9ba6e
|
fix: #455
|
2018-12-13 21:08:21 +08:00 |
|
zhichen
|
2f2404c14a
|
build js
|
2018-12-13 20:32:47 +08:00 |
|
zhichen
|
9200cbc329
|
fix 445
|
2018-12-13 20:29:24 +08:00 |
|
王彦民
|
6c1818a2b6
|
Update: public service
|
2018-12-13 19:09:42 +08:00 |
|
王彦民
|
261dd75f15
|
Update: build #393
|
2018-12-13 18:26:32 +08:00 |
|