Commit Graph

1665 Commits

Author SHA1 Message Date
chuntaojun
039baee47d refactor(api): Restore the yaml() method to be compatible with older clients 2019-07-05 17:18:25 +08:00
Fury Zhu
1119e9e332
Merge pull request #1487 from zhaoyuguang/zen2
fix unuseless import
2019-07-05 16:43:11 +08:00
nkorange
5e19d8d14b Merge remote-tracking branch 'upstream/develop' into develop 2019-07-05 16:34:04 +08:00
nkorange
4c055f38b9 Fix #1491 2019-07-05 16:33:52 +08:00
赵禹光
ce4e4c64de fix CI 2019-07-05 16:01:52 +08:00
赵禹光
56f43fdcf4 fix a typo 2019-07-05 14:56:20 +08:00
mingyixu
539466b3e2 Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-07-05 14:21:56 +08:00
mingyixu
2988dabffd add testcase 2019-07-05 14:21:46 +08:00
Fury Zhu
6a53387331
Merge pull request #1481 from aikin/patch-1
update codestyle java guideline link
2019-07-05 14:08:25 +08:00
Fury Zhu
d2f26bd4e4
Merge pull request #1483 from loadchange/feat/1.1.0
Fix edit configuration publish beta
2019-07-05 12:54:11 +08:00
Fury Zhu
fbe01896f7
Merge pull request #1461 from alibaba/feature_address_server
support address server mode and nacos client will use the endpoint to initializer
2019-07-05 12:51:39 +08:00
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
LoadChange
996faf298f fix: edit configuration publish beta 2019-07-05 11:46:37 +08:00
得少
b2253301c3 1. Optimize code design and comment
2. Optimize address server repacakge
2019-07-05 11:05:37 +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
aikin
b7c7ee00b9 update codestyle java guideline link 2019-07-04 22:15:34 +08:00
得少
48918cbbc7 change the design for nacos address 2019-07-04 21:50:43 +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
得少
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
邪影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
得少
c453e2130d Compatible with stand-alone mode 2019-07-02 15:15:49 +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
得少
7336a8b7f5 fix #1458
support address server mode ,so nacos client will use the endpoint to initializer
2019-07-01 23:08:08 +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