Commit Graph

247 Commits

Author SHA1 Message Date
nkorange
4d68565667 Update version to 1.1.4 2019-10-24 14:46:46 +08:00
Beldon
927e8d6fe4 Merge remote-tracking branch 'upstream/develop' into develop
# Conflicts:
#	console/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
2019-10-21 22:36:24 +08:00
ly
221d81dab8 Clean up redundant StringUtils 2019-09-25 20:49:37 +08:00
nkorange
6b7b894a0d Fix #1874 2019-09-25 15:46:34 +08:00
Fury Zhu
4b1a65c1cf
Merge pull request #1659 from Diffblue-benchmarks/add-GroupKey-tests
Add unit tests for com.alibaba.nacos.config.server.utils.GroupKey
2019-09-19 17:19:31 +08:00
Beldon
83aa8e2186 clean controllers code 2019-09-18 00:12:20 +08:00
chuntaojun
5074d06903 Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-09-11 22:44:02 +08:00
chuntaojun
8c47619af9 feat: 2019-09-11 22:43:57 +08:00
xianlaioy
08e69a0b21 refactor: 局部变量是线程安全的;
urlPattern改成static final;
          GroupKey重构
2019-09-09 20:15:19 +08:00
xianlaioy
7b5c6e9273 style: Modifiers should be declared in the correct order;Map init 设置大小 避免扩容; 2019-09-09 17:56:14 +08:00
xianlaioy
13e509679d style: Modifiers should be declared in the correct order;Map init 设置大小 避免扩容; 2019-09-09 17:55:02 +08:00
ly
40be568c01 [Issue] #1769 Solve the bug of the clone configuration function 2019-08-31 10:39:42 +08:00
ly
59a36f91e4 [Issue] #1769 Solve the bug of the clone configuration function 2019-08-30 21:31:40 +08:00
ly
1fd5ee360e [Issue] #1769 Solve the bug of the clone configuration function 2019-08-29 01:23:12 +08:00
Thomas Perkins
934c4238c1 Add unit tests for com.alibaba.nacos.config.server.utils.GroupKey
These tests were written using Diffblue Cover
2019-08-06 17:15:01 +01: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
Fury Zhu
838ef83f9f
Merge pull request #1534 from zhaoyuguang/zen3
format code
2019-08-01 11:04:24 +08:00
Fury Zhu
9b2367eb91
Merge pull request #1552 from nkorange/hotfix_log_optimization
Fix #290
2019-08-01 11:02:55 +08:00
yanlinly
ebca6772bd
Merge pull request #1547 from wfnuser/develop
feat: support update password api
2019-08-01 10:31:36 +08:00
Fury Zhu
b0dd759a85
Merge pull request #1511 from KeRan213539/multipleSelectionDeletion
Multiple selection deletion
2019-07-30 17:11:40 +08:00
Fury Zhu
ad5c249e7c
Merge pull request #1499 from chuntaojun/fix_issue_1492
feat(config): support different db name and password
2019-07-30 14:52:29 +08:00
nkorange
1711c3765f Fix #290 2019-07-15 15:47:02 +08:00
wfnuser
c5aec4c227 feat: support update password api 2019-07-14 22:28:34 +08:00
赵禹光
8320701f2e fmt 2019-07-11 20:27:59 +08:00
赵禹光
fb5a352ec6 fmt 2019-07-11 20:24:13 +08:00
赵禹光
1042831c2a fmt 2019-07-11 20:22:31 +08:00
赵禹光
60ae75f870 fmt 2019-07-11 20:21:10 +08:00
keran
b0530d6558 多选删除接口部分 2019-07-09 17:27:03 +08:00
keran
ac5acc9c6a Merge branch 'develop' into multipleSelectionDeletion 2019-07-09 14:13:27 +08:00
Fury Zhu
627331ef12
Merge pull request #1508 from KeRan213539/develop
导出查询结果增加dataId条件,修复导入失败的问题
2019-07-09 14:07:35 +08:00
keran
a39d288d15 导出查询结果增加dataId条件,修复导入失败的问题 2019-07-09 13:40:02 +08:00
keran
6f8bd9b1b1 增加多选删除的服务端接口 2019-07-09 11:15:09 +08:00
nkorange
65c2f55617 Fix standalone use derby failed bug 2019-07-09 11:04:00 +08:00
nkorange
d8eef4f2f5 Fix standalone mode cannot use MySQL bug. 2019-07-08 11:00:00 +08:00
chuntaojun
93a9b089cc feat(config): support different db name and password 2019-07-06 12:03:14 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
Fury Zhu
402b31adb6
Merge pull request #1254 from KeRan213539/exportAndImport
#1115 feature: configs export/import and clone
2019-07-02 12:42:30 +08:00
Fury Zhu
702289ad69
Merge pull request #1454 from zhaoyuguang/zen1
Fix #1453
2019-07-02 11:44:49 +08:00
邪影oO
39d49bb141
Merge branch 'develop' into exportAndImport 2019-07-01 17:54:44 +08:00
keran
51990b6a11 还原误提交的 2019-07-01 17:52:17 +08:00
keran
61b6302625 按照review意见修改 2019-07-01 17:48:45 +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
赵禹光
ea5eaf5441 fix2 2019-07-01 11:59:04 +08:00
赵禹光
179f810d89 bugfix and opt 2019-07-01 11:45:19 +08:00
Fury Zhu
fe950dccc2
Merge pull request #1401 from slievrly/develop
optimize array and negated codestyle
2019-06-30 22:47:46 +08:00
Fury Zhu
268d1d4ea9
Merge pull request #1443 from iHelin/develop
[ISSUE #1442] Fix JSONUtils#deserializeObject method.
2019-06-30 22:41:13 +08:00
nkorange
2c4e659d6c Update version to 1.0.2-SNAPSHOT 2019-06-28 17:51:04 +08:00