nkorange
|
29849041ba
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-07-05 12:48:24 +08:00 |
|
nkorange
|
7c0e12d6fe
|
Fix beat info null bug
|
2019-07-05 12:48:13 +08:00 |
|
Fury Zhu
|
9210a507bf
|
Merge pull request #1482 from KeRan213539/exportAndImportBugFix
fix: Export and import
|
2019-07-05 10:53:19 +08:00 |
|
keran
|
751699200c
|
修改错别字
|
2019-07-05 10:40:09 +08:00 |
|
Fury Zhu
|
1aa7711340
|
Merge pull request #1480 from loadchange/feat/1.1.0
Fix edit configuration type default value
|
2019-07-04 21:26:27 +08:00 |
|
LoadChange
|
592d911b97
|
fix: edit configuration type default value
|
2019-07-04 20:37:26 +08:00 |
|
LoadChange
|
eb55b975b8
|
Merge branch 'loadchange-issues/1476' into develop
|
2019-07-04 20:15:42 +08:00 |
|
LoadChange
|
b29953a594
|
fix: closes #1476
|
2019-07-04 20:15:06 +08:00 |
|
nkorange
|
49027b892d
|
Update version to 1.1.0-SNAPSHOT
|
2019-07-04 15:01:49 +08:00 |
|
邪影oO
|
d07fb22167
|
Merge pull request #3 from alibaba/develop
拉取最新代码
|
2019-07-04 14:57:48 +08:00 |
|
LoadChange
|
38866a464c
|
fix: closes #1476
|
2019-07-04 14:39:01 +08:00 |
|
keran
|
51172d419a
|
Revert "前端发布"
This reverts commit 9ae9847024.
|
2019-07-04 14:33:39 +08:00 |
|
xiaochun.xxc
|
024cf2a1c3
|
Merge branch 'develop' of https://github.com/alibaba/nacos into develop
|
2019-07-04 13:53:31 +08:00 |
|
xiaochun.xxc
|
4f613691ae
|
add batch config testcase
|
2019-07-04 13:53:12 +08:00 |
|
keran
|
9ae9847024
|
前端发布
|
2019-07-04 13:03:27 +08:00 |
|
Fury Zhu
|
df1f912f92
|
Merge pull request #1474 from loadchange/feat/1.1.0
fix: config editor beta button
|
2019-07-04 12:47:51 +08:00 |
|
LoadChange
|
17442b6523
|
fix: config editor beta button
|
2019-07-04 11:13:23 +08:00 |
|
Fury Zhu
|
e5d82c23eb
|
Merge pull request #1471 from loadchange/feat/1.1.0
Fix NewConfigEditor
|
2019-07-03 20:59:16 +08:00 |
|
LoadChange
|
c3f160fe87
|
fix: config editor
|
2019-07-03 20:09:09 +08:00 |
|
Fury Zhu
|
c031a275f7
|
Merge pull request #1457 from chuntaojun/fix_issue_1455
Fix issue 1455
|
2019-07-03 18:33:48 +08:00 |
|
Fury Zhu
|
f4d6012beb
|
Merge pull request #1462 from xianlaioy/patch-1
构建rDigits改成google的guava
|
2019-07-03 18:32:55 +08:00 |
|
Fury Zhu
|
c0fc702e9e
|
Merge pull request #1467 from loadchange/feat/1.1.0
ConfigEditor support beta
|
2019-07-03 18:31:06 +08:00 |
|
LoadChange
|
f39bf12e54
|
feat: NewConfigEditor api 对接
|
2019-07-02 22:09:42 +08:00 |
|
xianlaioy
|
4fc07d4852
|
构建rDigits改成google的guava
new HashMap<Character, Integer>(16); 负载因子是0.75,digits实际大小是16会扩容一次。
|
2019-07-02 15:27:28 +08:00 |
|
chuntaojun
|
e9694cdc42
|
ci(travis): update travis.yaml
|
2019-07-02 13:28:30 +08:00 |
|
邪影oO
|
124bbc6271
|
Merge pull request #2 from alibaba/develop
更新代码
|
2019-07-02 13:17:02 +08:00 |
|
chuntaojun
|
e6b09cb647
|
fix(client): fix Correction parameter name
|
2019-07-02 13:07:02 +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
|
b599a9eb9e
|
Merge pull request #1452 from zhaoyuguang/zen0
useless import
|
2019-07-02 11:45:47 +08:00 |
|
Fury Zhu
|
702289ad69
|
Merge pull request #1454 from zhaoyuguang/zen1
Fix #1453
|
2019-07-02 11:44:49 +08:00 |
|
LoadChange
|
a3800864ad
|
feat: NewConfigEditor
|
2019-07-01 22:07:30 +08:00 |
|
邪影oO
|
39d49bb141
|
Merge branch 'develop' into exportAndImport
|
2019-07-01 17:54:44 +08:00 |
|
chuntaojun
|
ff9ddfc31c
|
test(test): add issue #1455 test
|
2019-07-01 17:53:18 +08:00 |
|
keran
|
51990b6a11
|
还原误提交的
|
2019-07-01 17:52:17 +08:00 |
|
chuntaojun
|
a7d128923e
|
fix(client): fix issue #1455
|
2019-07-01 17:49:30 +08:00 |
|
keran
|
e7ac873fe3
|
按照review意见修改
|
2019-07-01 17:49:18 +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 |
|
赵禹光
|
d7ce18233a
|
useless import
|
2019-07-01 10:08:38 +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 |
|
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 |
|
Fury Zhu
|
defe701737
|
Merge pull request #1446 from Nicholas2015/hotfix_subscriber_array_494
Collective data de-duplication
|
2019-06-30 22:35:36 +08:00 |
|
Nicholas2015
|
71ee840111
|
Collective data de-duplication
|
2019-06-29 12:59:35 +08:00 |
|
nkorange
|
2c4e659d6c
|
Update version to 1.0.2-SNAPSHOT
|
2019-06-28 17:51:04 +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 |
|
nkorange
|
86f0f3c6d7
|
#1229 Add test case
|
2019-06-28 17:06:06 +08:00 |
|