zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,063 Commits 2 Branches 3 Tags 58 MiB
2.4.1-dm
Commit Graph

568 Commits

Author SHA1 Message Date
Jack Dai
9692cd1b8c 合并和origin/develop的冲突 2020-05-29 19:01:48 +08:00
Jack Dai
27a257c84e 合并origin/develop的变更 2020-05-29 18:41:00 +08:00
Jack Dai
594eac42b3 整理每个module的plugin和dependency的版本号 2020-05-29 16:35:48 +08:00
KomachiSion
d27a6c7ea6 Fix replace jackson error 2020-05-28 10:40:05 +08:00
KomachiSion
0b1a58e29b Remove all dependency except nacos-test 2020-05-27 15:41:07 +08:00
KomachiSion
3887a5e0b9 Abstract NacosRuntimeException as unchecked exception super class 2020-05-26 15:39:24 +08:00
KomachiSion
ff6e09e58d Handle serialization exception in JacksonUtils 2020-05-26 14:59:23 +08:00
KomachiSion
b443279ed0 Replace all fastjson with jackson in nacos-api 2020-05-26 14:59:23 +08:00
KomachiSion
4607bb7c00 Replace fastjson with jackson for Selector 2020-05-25 16:13:37 +08:00
KomachiSion
db6fc0c026 Fully compatible with the old format for health check 2020-05-25 16:13:37 +08:00
KomachiSion
f2ef335244 Add copyright for unit test 2020-05-25 16:12:04 +08:00
KomachiSion
95d7617012 Add copyright 2020-05-25 16:12:04 +08:00
KomachiSion
8c5bcd8715 Replace fastjson with jackson for health checker. 2020-05-25 16:12:04 +08:00
chuntaojun
afc74da826 build: update version to 1.3.0-BETA 2020-05-15 16:10:38 +08:00
water.lyl
54e251da39 release 1.3-beta 2020-05-11 23:06:23 +08:00
chuntaojun
29a6edc8c5 refactor: fix bugs 2020-05-08 14:53:29 +08:00
chuntaojun
2526c5d8f2 fix: fix naming request redirect 2020-05-03 20:26:35 +08:00
chuntaojun
a937e3090c fix: fix some bugs 2020-04-30 10:49:34 +08:00
nkorange
ea2a83c4be Update version to 1.2.1 2020-03-27 15:48:32 +08:00
nkorange
82d7147a58 Update version to 1.2.0 2020-03-03 16:24:08 +08:00
nkorange
31e6063209 Update version to 1.2.0-beta.1 2020-02-23 20:02:13 +08:00
ZShUn
16bbf5f37e 1.添加username password参数 2020-02-10 23:42:40 +08:00
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
Peter Zhu
a425f7258e
Merge branch 'develop_1.2.0' into develop 2020-01-10 17:58:30 +08:00
Peter Zhu
13f5810751
Merge pull request #2266 from nkorange/feature_access_control 
Feature access control
 2020-01-10 17:54:29 +08:00
Peter Zhu
1849d96935
Merge pull request #1715 from rushsky518/develop 
receive config change event
 2020-01-10 15:41:24 +08:00
nkorange
82731985aa #1105 Add integration tests 2020-01-09 19:13:37 +08:00
nkorange
e2c553cbca #1105 Access control finish 80% 2019-12-18 20:25:10 +08:00
Peter Zhu
264f686d1c
Merge pull request #2142 from easyhaloo/code_optimization 
refactor #2134 optimization code
 2019-12-12 22:42:20 +08:00
nkorange
38590d060c Fix #2123 2019-12-06 11:53:01 +08:00
shenggangshu
1082539d89 refactor #2134 optimization code 2019-12-03 18:45:10 +08:00
nkorange
2781c6c84f Update version to 1.2.0-SNAPSHOT 2019-12-02 14:56:15 +08:00
rushsky518
3c1d6d00c3 #1550 添加单元测试；部分类移动到 api 模块 2019-11-28 11:56:04 +08:00
rushsky518
93773c47d6 #1550 抽象出 spi 接口 2019-11-26 21:35:05 +08:00
zzh
7582de9910 Modify the string splicing method of getgroupedname() 2019-11-06 10:15:38 +08:00
nkorange
5caa57351a Fix PMD 2019-10-30 10:20:16 +08:00
nkorange
f4f90a08ed Fix add metadata method NPE. 2019-10-29 15:36:12 +08:00
nkorange
4d68565667 Update version to 1.1.4 2019-10-24 14:46:46 +08:00
Fury Zhu
3f68ce083d
Merge pull request #1953 from nkorange/feature_mcp 
Feature mcp
 2019-10-22 18:02:15 +08:00
nkorange
225f0cae51 Fix findbugs 2019-10-22 17:05:48 +08:00
Vettal Wu
07d08b381e Support snowflake instance id generator 
Signed-off-by: Vettal Wu <vettal.wd@alibaba-inc.com>
 2019-10-21 17:44:08 +08:00
dizhe
d248bc9ecc Support unique instance index for each registered server 
Signed-off-by: dizhe <vettal.wd@alibaba-inc.com>
 2019-10-18 16:05:51 +08:00
rushsky518
a815d7b7de Merge branch 'develop' of https://github.com/rushsky518/nacos into develop 
# Conflicts:
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
 2019-10-11 20:09:19 +08:00
rushsky518
f3bd147317 #1550 nacos server return config type 2019-10-11 19:58:42 +08:00
nkorange
6b7b894a0d Fix #1874 2019-09-25 15:46:34 +08:00
xianlaioy
13e509679d style: Modifiers should be declared in the correct order;Map init 设置大小 避免扩容； 2019-09-09 17:55:02 +08:00
pbting
2431edae4c
Merge branch 'develop' into feature_enhance_interface 2019-09-06 13:27:52 +08:00
nkorange
95b92b06e9 Fix #1621 2019-09-06 12:53:31 +08:00
pbting
17ab94dba8
Merge branch 'develop' into feature_enhance_interface 2019-08-28 18:19:01 +08:00
赵禹光
571389ef4e Merge branch 'develop' into zen5 
# Conflicts:
#	console/src/main/resources/static/js/main.js
 2019-08-21 16:49:48 +08:00
rushsky518
b29e8c089c #1550 yaml 展平 2019-08-16 17:11:24 +08:00
pbting
a6deeb1fed add comma division with some case to use 2019-08-16 09:45:47 +08:00
pbting
3bd5dcb1cf add comma division with some case to use 2019-08-16 09:44:06 +08:00
rushsky518
1877e7d307 #1550 流程调通 2019-08-15 17:37:03 +08:00
nkorange
6ca2ee0cf8 Update version to 1.1.3 2019-08-06 18:55:05 +08:00
nkorange
15c913e346 Update version to 1.1.2 2019-08-06 17:10:37 +08:00
nkorange
11bd0ccd76 Update version to 1.1.2-SNAPSHOT 2019-08-02 12:35:04 +08:00
赵禹光
6a9b414315 fix bug 2019-08-01 20:56:52 +08:00
chuntaojun
09ce016ac8 fix(api): fix issue #1500 2019-07-07 11:39:21 +08:00
nkorange
15eff1c3db Merge remote-tracking branch 'upstream/develop' into develop 2019-07-05 22:00:06 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
chuntaojun
9277db2084 docs(api): add details desc 2019-07-05 17:26:27 +08:00
chuntaojun
039baee47d refactor(api): Restore the yaml() method to be compatible with older clients 2019-07-05 17:18:25 +08:00
得少
b2253301c3 1. Optimize code design and comment 
2. Optimize address server repacakge
 2019-07-05 11:05:37 +08:00
得少
7f97289340 Merge branch 'develop' into feature_address_server 2019-07-04 15:07:03 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
得少
7336a8b7f5 fix #1458 
support address server mode ,so nacos client will use the endpoint to initializer
 2019-07-01 23:08:08 +08:00
Fury Zhu
819d5d1db5
Merge pull request #1404 from slievrly/charset 
optimize charset、continue and return
 2019-07-01 13:12:03 +08:00
Fury Zhu
dc7485b108
Merge pull request #1427 from chuntaojun/feat_config_prefix 
[FEATURE] @NacosConfigurationProperties support prefix setting
 2019-06-30 22:54:27 +08:00
nkorange
3a8575e22f Update version to 1.0.2-SNAPSHOT 2019-06-28 17:34:59 +08:00
nkorange
4605733595 Update version to 1.0.2 2019-06-28 17:18:59 +08:00
Fury Zhu
00f989f51e
Merge pull request #1426 from IanCao/master 
【issue】 #1425
 2019-06-27 18:51:38 +08:00
Fury Zhu
fac3dc8a23
Merge branch 'develop' into charset 2019-06-27 18:50:57 +08:00
chuntaojun
0885d08778 feat(api): @NacosConfigurationProperties support prefix setting 2019-06-24 20:25:24 +08:00
Fury Zhu
57b0fe3b52
Merge pull request #1414 from IanCao/fix11 
【issue】#1278
 2019-06-24 14:21:22 +08:00
caoyixiong
6d6e4a184c format 2019-06-24 14:00:49 +08:00
caoyixiong
2ca8e0c1b3 fix 2019-06-24 13:57:51 +08:00
caoyixiong
4c87550750 update nacosException 2019-06-24 13:55:50 +08:00
caoyixiong
502fa0dcdc 【issue】 #1425 2019-06-24 10:54:15 +08:00
Fury Zhu
c7fe374af6
Merge pull request #1413 from chuntaojun/develop 
feat(nacos-api): add enableRemoteSyncConfig properties setting
 2019-06-24 10:24:58 +08:00
Fury Zhu
0867117e3f
Merge branch 'develop' into master 2019-06-23 06:50:16 +08:00
caoyixiong
1decd04008 #1278 2019-06-21 11:41:55 +08:00
caoyixiong
b2242194f4 fix 2019-06-20 23:11:02 +08:00
chuntaojun
090b047d4b feat(nacos-api): add enableRemoteSyncConfig properties setting 2019-06-20 14:52:07 +08:00
slievrly
e01a44702b optimize charset、continue and return 
Signed-off-by: slievrly <slievrly@163.com>
 2019-06-19 23:47:55 +08:00
slievrly
443679c1c8 remove unused import 2019-06-19 22:52:31 +08:00
chuntaojun
c91f99b82e fix(nacos-client:config): Fix code conflicts 2019-06-18 23:27:28 +08:00
Fury Zhu
d5e8ef5063
Merge branch 'develop' into study 2019-06-18 10:47:21 +08:00
chuntaojun
44e3c5e224 refactor(nacos-api:config): Modify ConfigYype to be an enumeration class 2019-06-17 18:31:50 +08:00
IanCao
6b4a9b72a5 fix bug 2019-06-17 18:07:54 +08:00
chuntaojun
21ff07563d refactor(nacos-client:config): rmove un use construct of CacheData 2019-06-16 08:24:17 +08:00
chuntaojun
ade510f31d feat(nacos-client:config): fix issue #1317 2019-06-15 23:37:12 +08:00
chuntaojun
240ee50aa2 fix(nacos-client:config): fix issue 1317 2019-06-15 19:12:54 +08:00
chuntaojun
22df13b0e2 feat(nacos-api): add config type setting 2019-06-14 21:18:45 +08:00
chuntaojun
cc5e636a31 feat: 2019-06-14 19:31:11 +08:00
赵禹光
10aa620315 All overriding methods must be preceded by @Override annotations. 2019-06-14 18:54:04 +08:00
caoyixiong
4f56452999
Merge pull request #3 from alibaba/master 
merge
 2019-06-14 05:35:19 -05:00
chuntaojun
75868623b2 fix(nacos-api/nacos-client): Fix setting parameter acquisition problem and nacos properties add new 2019-06-14 17:06:50 +08:00
chuntaojun
ac846dfe08 fix(nacos-api): fix some property name 2019-06-14 16:56:28 +08:00
nkorange
a60bed8dee Update version to 1.0.1 2019-06-12 16:28:12 +08:00
nkorange
a7f3cabf3c Update version to 1.0.1-SNAPSHOT 2019-06-11 17:04:36 +08:00
IanCao
63560370ae Different instance has different TTL. 2019-06-11 14:40:28 +08:00
chuntaojun
aa41a10616 fix(nacos-client:config): Fix failed custom parameter setting error 2019-06-11 13:26:20 +08:00
chuntaojun
dd9676c2e4 fix(nacos-client): fix merge conflict 2019-06-11 09:16:22 +08:00
chuntaojun
0e653a9b39 refactor(nacos-client:config): Modify the long poll timeout parameter to add Max retry custom Settin 2019-06-11 09:12:59 +08:00
chuntaojun
5623577a36 refactor(nacos-client): 修改config的LongPoll轮询的机制 2019-06-06 21:44:42 +08:00
chuntaojun
1f102f52f4 feat: 2019-06-06 20:38:24 +08:00
chuntaojun
72a3a9b213 feat: 2019-06-05 22:31:09 +08:00
yongchao9
0a58348438 Merge remote-tracking branch 'upstream/develop' into hotfix_169 
合并远程develop分支
 2019-06-05 20:43:20 +08:00
yongchao9
c1ac93aee8 同步远程develop分支 2019-06-05 20:43:12 +08:00
Fury Zhu
9319b76d22
Merge pull request #1307 from pbting/namespace_unified 
Namespace And Endpoint Support Multi Enviroment Switch
 2019-06-04 17:15:26 +08:00
pbting
3b869fcdbe change the comment from Chinese to English 2019-06-04 16:44:12 +08:00
Fury Zhu
3174aae243
Merge pull request #1290 from chuntaojun/develop 
feat(client): @NacosConfigurationProperties support yaml style config
 2019-06-04 16:29:53 +08:00
pbting
302ae79b3f 1. 注释改成中文 
2. StringUtils 统一改成
3. 参数命名改为 nacos 前缀
 2019-06-04 15:55:47 +08:00
pbting
9963ca5f3f change the version 2019-05-31 15:25:25 +08:00
pbting
c4be24a536 nacos client namespace support multi enviroment switch 2019-05-31 15:21:58 +08:00
chuntaojun
97ff458422 feat(client): @NacosConfigurationProperties support yaml style config 2019-05-29 11:21:04 +08:00
Fury Zhu
5cab208cbd
Merge pull request #1228 from sheiy/master 
Update pom.xml
 2019-05-17 19:24:52 +08:00
sheiy
229262f5a1
Update pom.xml 
java.util.Objects 至少需要jdk7
 2019-05-15 23:06:46 +08:00
Fury Zhu
1f1b047984
Merge pull request #1126 from XCXCXCXCX/ISSUE_#359 
[#359] provide a way for user to implement their health checkers.
 2019-05-12 11:04:14 +08:00
Fury Zhu
df6f3a8df7
Merge pull request #1130 from chuntaojun/feature_service_curd 
[ISSUE #747、#1154] Add create and update service methods in SDK and update instance operation
 2019-05-09 10:45:54 +08:00
chuntaojun
221ce1237a fix(api): fix NamingMaintainFactory create NamingMaintainService cannot find Class 2019-05-09 10:22:16 +08:00
chuntaojun
ac36a41d86 refactor(api、client): modify MaintainService to NamingMaintainService 2019-05-09 10:07:09 +08:00
chuntaojun
141f8a19ea refactor(client): 2019-05-08 15:29:01 +08:00
chuntaojun
8c82f85a74 refactor: 2019-05-07 12:03:34 +08:00
chuntaojun
4817b26bc9 refactor(client): Fix the issues raised in the comments 2019-05-07 11:11:24 +08:00
chuntaojun
320aca4d90 style(api): The revised code is in compliance with the specification 2019-04-30 19:27:06 +08:00
chuntaojun
f2c046a395 refactor(client): Service operation function module split 2019-04-30 17:46:10 +08:00
chuntaojun
ea214e1d50 feat(client): add feature of service curd 2019-04-27 22:32:28 +08:00
XCXCXCXCX
6615ae8106 [#359] Use SPI to make health scalable 2019-04-27 13:55:04 +08:00
huangyonghui
8ac94b61b4 NamingEvent add getGroupName and getClusters method 2019-04-24 15:08:16 +08:00
nkorange
a87cc12d47 Update version to 1.0.0 2019-04-15 20:01:34 +08:00
nkorange
699bdcb6dc Update to 1.0.0-SNAPSHOT 2019-04-15 16:36:10 +08:00
得少
427a746e82 change the default value of isUseEndpointParsingRule from false to true 2019-04-12 12:49:46 +08:00
nkorange
3c1c98aaf1 Update version to 1.0.0 2019-04-10 22:04:27 +08:00
pbting
b7a1fb22b3
Merge branch 'develop' into develop 2019-04-03 19:08:09 +08:00
得少
eca7a9a422 support parsing endpoint rule 2019-04-03 18:31:27 +08:00
Fury Zhu
e0547c82ca
Merge pull request #997 from alibaba/feature_naming_group 
Feature naming group
 2019-04-02 20:57:04 +08:00
water.lyl
d11fd7f73e support aliyun ram role 2019-03-27 14:13:15 +08:00
nkorange
14ecd9c230 #502 Fix data inconsistent bug 2019-03-26 14:07:06 +08:00
nkorange
fcf968c36b Update version to 1.0.0-RC2 2019-03-22 17:29:26 +08:00
nkorange
52d4e01bc7 #502 Fix several bugs 2019-03-18 20:57:28 +08:00
nkorange
7ec7311fc7 Close #911 2019-03-18 10:36:54 +08:00
nkorange
488075fa52 Update version to 1.0.0-RC1 2019-03-15 15:48:30 +08:00
nkorange
592f2b4301 #502 Add NONE healthChecker 2019-03-15 15:08:01 +08:00
nkorange
6034bdbdb9 #502 Compatible with 0.8.0 2019-03-14 16:04:07 +08:00
nkorange
dae2809630 Merge branch 'develop' into feature_naming_group 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	client/src/main/java/com/alibaba/nacos/client/naming/utils/UtilAndComs.java
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	pom.xml
#	test/pom.xml
 2019-03-07 19:24:22 +08:00
nkorange
82ec466a8b #629 refactor warm up 2019-03-07 14:51:14 +08:00
nkorange
c4ad0888e0 #869 Clarify exception message 2019-03-06 11:59:15 +08:00
nkorange
8c23f34806 #269 fix bug 2019-03-04 17:12:29 +08:00
得少
df15d56018 constract error message will transfor to pararent construct 2019-03-04 17:09:09 +08:00
得少
43a51c0f25 #861 2019-03-04 16:56:01 +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
xuechaos
80c260e207 Release 0.9.0 Nacos : Nacos server function mode and fix 13 issues 
* [#840] Nacos server adds startup mode to distinguish between config and naming.
* [#762] Register instance returns failed when the health check mode is 'server' in standalone mode.
* [#473] Nacos Cluster Mode kubernate Startup nacos.log error Log.
* [#240] Log strong dependence problem.
* [#824] getServicesOfServer throws exception if service list is empty.
* [#802] Nacos server multi-boot mode support.
* [#800] Nacos's client-to-server addressing mode document introduction.
* [#768] The interval at which the heartbeat is sent in BeatReactor is not controlled by the server return value.
* [#759] why instance can't auto-delete.
* [#756] Format of instance and service should be validated.
* [#720] Memory leak in PushService.
* [#653] IoUtils under nacos-common-0.2.1-RC1.jar lacks "" judgment on encoding.
* [#588] Client compatible to jdk1.6. On branch develop
 2019-03-01 00:46:50 +08:00
xuechaos
0ca7323df9 #588 build client and dependenties use 1.6 2019-02-28 17:52:06 +08:00
pbting
e916431d65
Update SystemPropertyKeyConst.java 2019-02-22 17:43:28 +08:00
得少
b3ee9698fa #817 2019-02-22 17:06:02 +08:00
nkorange
59c2765ada Fix #809 2019-02-22 12:25:05 +08:00
nkorange
7af1b480b8 #269 Support service group 2019-02-18 16:04:55 +08:00
nkorange
9409ebfd8b Merge branch 'feature_naming_ap' into feature_naming_group 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
 2019-02-18 08:49:41 +08:00
nkorange
451863fe33 Update version to 0.8.1 2019-02-15 11:54:10 +08:00
pbting
5e78e9a315
Merge branch 'feature_support_ans' into 0.8.0-poc-support-ans 2019-02-15 11:08:03 +08:00
nkorange
dd9db82b7b Merge develop 2019-02-14 19:33:33 +08:00
pbting
15e0f30849 fix #367 2019-02-14 18:00:01 +08:00
pbting
e9bbe492bb code format with idea 2019-02-13 16:12:16 +08:00
nkorange
9783240e9d #269 Support service group 2019-02-13 15:46:28 +08:00
pbting
1a6fa9e69c support ans 2019-02-13 15:42:41 +08:00
nkorange
194387b583 #745 Support multiple server modes 2019-02-11 14:59:12 +08:00
nkorange
58b8d1640f #744 Add server status, #629 Add partition service warm up logic 2019-02-09 15:43:03 +08:00
nkorange
cba85f0635 #502 Fix licence problem 2019-02-02 15:14:16 +08:00
nkorange
ab562117d5 #502 Fix HTTP 302 use GET problem. 2019-02-01 19:59:41 +08:00
nkorange
d3a4834672 #650 Server list manager detects healthy servers 2019-01-30 10:06:37 +08:00
nkorange
caf7213c2d #502 Fix serialize problem and do some refactoring for health check 2019-01-27 22:50:41 +08:00
nkorange
0e0900bfa9 #677 Add ephemeral instance implementation 2019-01-24 16:56:51 +08:00
nkorange
6ebde678d3 #502 Reorganize parameter mapping. 2019-01-23 15:33:20 +08:00
water.lyl
f29209b114 release 0.8 2019-01-22 22:16:13 +08:00
nkorange
f2b43fb240 #502 Update author information 2019-01-19 21:23:35 +08:00
nkorange
d064fe36bb Merge branch 'develop' into feature_naming_ap 2019-01-18 11:38:20 +08:00
wuyoushan
938666c7b8 remove useless semicolon 2019-01-17 18:02:44 +08:00
nkorange
d0bfc0e179 Merge branch 'feature_multi_tenant' into feature_naming_ap 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/MysqlHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/TcpSuperSenseProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
 2019-01-14 16:59:13 +08:00
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
Fury Zhu
15aec2aa61
Merge branch 'develop' into feature_subscription_by_query_optional 2019-01-14 14:28:53 +08:00
nkorange
baa4b4c1f1 #502 Update pom version 2019-01-13 10:26:23 +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
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
nkorange
63cf9dd00a Fix #599 2019-01-09 20:36:08 +08:00
nkorange
c7800b42bd fix #587 2019-01-09 10:08:05 +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
universefeeler
214ec62b90 delete some conflict sign 2019-01-04 23:03:12 +08:00
universefeeler
0a5f627808 fixed conflict 2019-01-04 22:34:58 +08:00
nkorange
720ab596a7 #497 Make subscription by query optional 2019-01-04 15:24:10 +08:00
FrankBian
b7e0f344fb correct typos,and remove some unnecessary 'public' method modifier 2018-12-29 17:40:15 +08:00
FrankBian
acc4e337d2 clean code,remove repeat code 2018-12-29 17:21:10 +08:00
wanglei1
34889e62a1 format codes and correct comments for nacos-api 2018-12-27 21:24:35 +08:00
nkorange
478cb1533e #498 Naming supports namespace 2018-12-25 16:48:27 +08:00
nkorange
947e0439b0 #269 Register instance with tenant info 2018-12-19 11:02:31 +08:00
nkorange
64f29ddd78 #187 Add label dump task 2018-12-18 16:03:26 +08:00
nkorange
066aaeaec0 Merge branch 'master' into 0.7.0 
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	console/src/main/resources/static/console-fe/src/i18ndoc.js
#	console/src/main/resources/static/console-fe/src/locales/en-US.js
#	console/src/main/resources/static/console-fe/src/locales/zh-CN.js
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	pom.xml
#	test/pom.xml
 2018-12-14 17:55:20 +08:00
nkorange
be64c1acf7 Update version to 0.7.0 2018-12-14 17:48:57 +08:00
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
a5e564dbe5 Update version to 0.6.1 2018-12-11 17:15:57 +08:00
nkorange
1b3c5fb4ba Prepare for 0.6.1 2018-12-11 16:34:43 +08:00
nkorange
8c50599a15 #429 Filter services by metadata 2018-12-11 16:10:48 +08:00
hxy1991
97743685ac Fixes #363 2018-12-10 19:53:15 +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
xuechaos
d4edde980b Nacos release 0.6.0 version 
#388 Cluster name should be provided in the Instance
#377 Clean up messy code in Naming module
#369 Support instance list persisted on disk
#366 findbugs-maven-plugin version
#362 The metadata will lost when online or offline instance through web ui
#352 Refactoring internationalization Nacos console
#278 Nacos docker img
#243 optimize the efficiency of integration testing, it’s taking too long now
 2018-12-07 15:19:43 +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
dungu.zpf
d795ad7d2b 0.5.0 release 2018-11-19 19:54:08 +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
nkorange
46c141900e Fix PMD 2018-11-16 12:07:25 +08:00
hxy1991
af21897608 correct license 2018-11-16 10:28:28 +08:00
nkorange
361ae0b2dd Fix raft publish bug 2018-11-15 14:19:08 +08:00
nkorange
d3751a99af #209 Disable service and cluster level customization in client 2018-11-08 16:34:18 +08:00
water.lyl
7fdd80cc31 update version to 0.4.0 2018-11-05 20:34:37 +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
nkorange
aa7e2e41e7 remove ip use weak raft 2018-10-30 16:16:01 +08:00
water.lyl
70651a89a7 Fix #38 2018-10-30 11:06:55 +08:00
xuechaos
077c4cdb6f release Nacos 0.3.0, update version to 0.3.0 2018-10-26 21:55:05 +08:00
xuechaos
9275dd7c24 update copyright 2018-10-25 19:02:32 +08:00
nkorange
abdc48fc84 Fix register instance with customized cluster name failed bug. 2018-10-25 15:56:02 +08:00
wyp12
1cf0a5b731 Merge remote-tracking branch 'origin/hotfix-clientbeat-failed' into feature_ServiceMesh 2018-10-24 18:00:02 +08:00
nkorange
f4e8684fdf Fix #149 2018-10-24 17:54:34 +08:00
wyp12
5cc9137d66 update 2018-10-23 14:56:26 +08:00
xuechaos
1fbcf24521 update 0.3.0-RC1 uppercase letter 2018-10-19 18:36:29 +08:00
nkorange
534995a405 Resolve conflicts 2018-10-18 18:59:45 +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
wyp12
251b2f01d8 merge master 2018-10-17 19:45:35 +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
3b5eb060e8 Polish alibaba/nacos#103 2018-10-01 12:15:21 +08:00
mercyblitz
99b5827409 Polish alibaba/nacos#101 2018-10-01 11:19:53 +08:00
mercyblitz
be8f3c2052 Polish alibaba/nacos#103 2018-10-01 10:58:27 +08:00
mercyblitz
85df9e077f Fixed alibaba/nacos#98 2018-09-30 16:41:40 +08:00
nkorange
44cf03db2d Update version to 0.2.1 2018-09-27 14:22:19 +08:00
nkorange
adafaf7086 Merge branch 'master' into 0.2.2 2018-09-26 21:20:22 +08:00
xuechaos
d24f8680d9 fix mvn -B clean apache-rat:check 
close #79
 2018-09-26 20:05:17 +08:00
caogu.wyp@alibaba-inc.com
5dfd4b6451 update version 2018-09-26 19:59:41 +08:00
nkorange
b54a0a9b9d Update version to 0.2.2-SNAPSHOT 2018-09-21 16:46:49 +08:00
nkorange
ba84fda664 Fix #66 2018-09-21 16:19:25 +08:00
nkorange
4b5bdec0ab Fix #66, Enable deregistering the last instance 2018-09-21 16:13:41 +08:00
hxy1991
357702afaa Modify the version to 0.2.1-RC1 2018-09-21 15:46:53 +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
978bb024d7 [motify info] Streamlining packet dependencies 2018-09-13 21:57:44 +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