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 |
|
nkorange
|
7a64ce2177
|
#187 Fix bug
|
2018-12-14 17:00:18 +08:00 |
|
nkorange
|
f96794e170
|
#187 Fix bug
|
2018-12-13 20:01:07 +08:00 |
|
Zhen Tang
|
98e447e146
|
Fix typo: Long pulling -> Long polling.
|
2018-12-13 09:13:28 +08:00 |
|
nkorange
|
8c50599a15
|
#429 Filter services by metadata
|
2018-12-11 16:10:48 +08:00 |
|
nkorange
|
7115834a98
|
#421 Fixed
|
2018-12-10 19:52:58 +08:00 |
|
nkorange
|
3198ec69ca
|
#187 Refactor some logic
|
2018-12-10 15:37:48 +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 |
|
nkorange
|
aace49640a
|
#187 provide CMDB module
|
2018-12-05 12:08:49 +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 |
|
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 |
|
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
|
af21897608
|
correct license
|
2018-11-16 10:28:28 +08:00 |
|
nkorange
|
d3751a99af
|
#209 Disable service and cluster level customization in client
|
2018-11-08 16:34:18 +08:00 |
|
nkorange
|
bbc3c24226
|
Use HTTP redirect instead of resend request
|
2018-11-05 17:09:00 +08:00 |
|
nkorange
|
1a9a282682
|
#176 Bypass local cache at client start by default.
|
2018-10-31 17:14:17 +08:00 |
|
water.lyl
|
70651a89a7
|
Fix #38
|
2018-10-30 11:06:55 +08:00 |
|
nkorange
|
abdc48fc84
|
Fix register instance with customized cluster name failed bug.
|
2018-10-25 15:56:02 +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 |
|
nkorange
|
2ffeb256d3
|
Support update instance and query instance list
|
2018-10-13 12:19:10 +08:00 |
|
dungu.zpf
|
86d8c7a4c4
|
fix #121 and refactor health check model
|
2018-10-11 16:11:48 +08:00 |
|
dungu.zpf
|
fe47b683b3
|
1. Support get service detail, cluster detail and instance detail in a single method;
2. Server model refactored to extend classes in nacos-api;
|
2018-10-06 10:22:01 +08:00 |
|
mercyblitz
|
99b5827409
|
Polish alibaba/nacos#101
|
2018-10-01 11:19:53 +08:00 |
|
xuechaos
|
d24f8680d9
|
fix mvn -B clean apache-rat:check
close #79
|
2018-09-26 20:05:17 +08:00 |
|
nkorange
|
4b5bdec0ab
|
Fix #66, Enable deregistering the last instance
|
2018-09-21 16:13:41 +08:00 |
|
nkorange
|
e2ef1f3da2
|
Fix #66
|
2018-09-19 19:45:44 +08:00 |
|
nkorange
|
413512661b
|
Fix #68
|
2018-09-19 19:21:42 +08:00 |
|
water.lyl
|
b9cd75b640
|
Fix #65
Nacos default port changed from 8080 to 8848
|
2018-09-19 19:06:03 +08:00 |
|
nkorange
|
52c306ae65
|
Adjust for jdk 1.7
|
2018-09-18 20:32:55 +08:00 |
|
nkorange
|
1ca8a65234
|
Fix naming client throws exception when the service contains empty instance list.
|
2018-09-17 19:39:00 +08:00 |
|
mercyblitz
|
1145260d64
|
Update 0.2.1 and refactor some APIs
|
2018-09-15 13:50:25 +08:00 |
|
mercyblitz
|
05b5425d59
|
Merge Other APIs
|
2018-09-14 15:31:19 +08:00 |
|
water.lyl
|
8c7dcd7bb3
|
[motify info] config health info
|
2018-09-13 17:55:53 +08:00 |
|
water.lyl
|
89c5c8fd76
|
[motify info] Resolve code conflicts
|
2018-09-13 17:23:04 +08:00 |
|
water.lyl
|
de1d976432
|
Merge remote-tracking branch 'origin/0.3.0' into v0.2
* origin/0.3.0: (32 commits)
[modify info] restruct equal name to void conflict
[motify info] fix pmd
[motify info] Api split
fix bug and change some input style
fix: modify wrong code
[motify info] fix rollback problem
update code
[motify info] push web ui,and build shell
gitignore add build dir
fix: setParams decode bug
[motify info] push static result
[motify info] fix edit info
[motify info] push build result,and fix namespace undefined problem
fix tags bug
update add index.css
[motify info] mix useful
[motify info] push core ui
feat: add i18n feature
替换白底logo
update: update header css
...
|
2018-09-13 15:48:24 +08:00 |
|
water.lyl
|
2986620fef
|
[modify info] restruct equal name to void conflict
|
2018-09-13 13:19:29 +08:00 |
|
water.lyl
|
eb74cd6a36
|
[motify info] fix pmd
|
2018-09-13 11:37:50 +08:00 |
|
water.lyl
|
8719aea7c7
|
[motify info] Api split
|
2018-09-13 11:30:25 +08:00 |
|