Commit Graph

1679 Commits

Author SHA1 Message Date
邪影oO
6919c83fc5
Merge pull request #6 from alibaba/develop
更新代码
2019-07-09 14:12:35 +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
551f64ba84 导出查询结果增加dataId条件 2019-07-09 13:38:28 +08:00
nkorange
65c2f55617 Fix standalone use derby failed bug 2019-07-09 11:04:00 +08:00
邪影oO
3d65579094
Merge pull request #5 from alibaba/develop
更新代码
2019-07-09 10:45:41 +08:00
nkorange
d8eef4f2f5 Fix standalone mode cannot use MySQL bug. 2019-07-08 11:00:00 +08:00
Fury Zhu
a15fc9faf7
Merge pull request #1494 from loadchange/feat/1.1.0
Fix ConfigEditor
2019-07-06 20:06:07 +08:00
LoadChange
8eb2677738 fix: edit configuration show data 2019-07-05 22:17:46 +08:00
nkorange
fbf006dc99 Fix JDK 1.6 compile failed bug 2019-07-05 22:09:40 +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
Fury Zhu
f74827e838
Merge pull request #1493 from chuntaojun/support_old_version
Fix @NacosConfigurationProperties to support old version
2019-07-05 19:30:47 +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
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