Commit Graph

1195 Commits

Author SHA1 Message Date
xxc
0b5add22c7
Merge pull request #81 from alibaba/0.2.2
0.2.2
2018-09-27 14:28:08 +08:00
nkorange
44cf03db2d Update version to 0.2.1 2018-09-27 14:22:19 +08:00
zhichen
a56f4c6c52
Merge pull request #85 from loadchange/0.3.0
feat: service page
2018-09-27 14:00:31 +08:00
nkorange
37f8260940 Fix version error 2018-09-27 12:33:54 +08:00
王彦民
3d5b4b91d4 feat: service page 2018-09-27 10:59:32 +08:00
Keep
b98fb2cb56
Merge pull request #83 from alibaba/fix_bug
fix duplicate Maven dependencies(#82)
2018-09-27 00:56:11 +08:00
caogu.wyp@alibaba-inc.com
5803c6b34d fix duplicate Maven dependencies(#82) 2018-09-27 00:04:06 +08:00
nkorange
adafaf7086 Merge branch 'master' into 0.2.2 2018-09-26 21:20:22 +08:00
xuechaos
e3a40d7610 fix wrong shell to startup server, thanks to yanj0609 2018-09-26 20:32:28 +08:00
xxc
874f4403a2
Merge pull request #72 from yanj0609/master
[ISSUE #69] Fix application cannot use {BASE_DIR}/conf/application.properties
2018-09-26 20:24:56 +08:00
xxc
95fa09ac73
Update .travis.yml 2018-09-26 20:19:40 +08:00
xxc
1044a433a3
Merge pull request #80 from alibaba/0.2.1
0.2.1
2018-09-26 20:17:19 +08:00
xuechaos
7997644589 del nacos server port in startup.cmd 2018-09-26 20:14:36 +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
d5dd0f95ec Merge branch 'master' of github.com:alibaba/nacos 2018-09-26 20:03:43 +08:00
caogu.wyp@alibaba-inc.com
5dfd4b6451 update version 2018-09-26 19:59:41 +08:00
xxc
eb4994f2dd
Update PULL_REQUEST_TEMPLATE.md 2018-09-26 19:08:37 +08:00
nkorange
f1c5dac508 Fix #78 2018-09-26 17:38:25 +08:00
caogu.wyp@alibaba-inc.com
be97fbd5c7 init nacos serviceMesh 2018-09-26 17:36:21 +08:00
zhichen
5b27dd4221 modify README.md 2018-09-25 15:00:53 +08:00
hxy1991
b69e7da751 Eliminate warnings: Redundant array creation for calling varargs method 2018-09-24 22:18:16 +08:00
xuechaos
01afa98697 update config pom 2018-09-21 16:58:31 +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
xuechaos
4603fb221a update shell 2018-09-21 15:11:23 +08:00
yanj0609
135524a8c8 Fix #69
* Add external config location to default config locations.

* The option '-cp' will be ignored when using 'java -jar'.
2018-09-20 23:23:06 +08:00
zhichen
f04be0b7ca ignore i18ndoc.js 2018-09-20 20:31:10 +08:00
zhichen
5c04f1f274 add build.js 2018-09-20 20:15:23 +08:00
nkorange
188d4314f6 Fix test case bug 2018-09-20 16:22:05 +08:00
hxy1991
65153c3138 Update "pom.xml" for removing <distributionManagement> 2018-09-19 22:23:47 +08:00
xuechaos
b5fe4fd434 client jdk support 1.6 and del unuse file 2018-09-19 22:18:31 +08:00
xuechaos
8661c87db3 Merge branch '0.2.1' of https://github.com/alibaba/nacos into v0.2.1 2018-09-19 22:17:12 +08:00
hxy1991
ee0575b1c2 Merge branch 'upstream' into 0.2.1 2018-09-19 21:17:22 +08:00
nkorange
e2ef1f3da2 Fix #66 2018-09-19 19:45:44 +08:00
Keep
d9a266aac6
Merge pull request #63 from hxy1991/master
Fix #62
2018-09-19 19:41:27 +08:00
nkorange
0667224647 Fix #65 for naming 2018-09-19 19:35:45 +08:00
nkorange
413512661b Fix #68 2018-09-19 19:21:42 +08:00
nkorange
27118eb81d Merge remote-tracking branch 'origin/0.2.1' into 0.2.1 2018-09-19 19:18:27 +08:00
nkorange
09650c16eb Fix #64 2018-09-19 19:16:42 +08:00
water.lyl
9839062d32 Fix #67
The configuration module log is changed to config
2018-09-19 19:15:54 +08:00
nkorange
f009fa1c9a Fix #64 2018-09-19 19:14:19 +08:00
water.lyl
b9cd75b640 Fix #65
Nacos default port changed from 8080 to 8848
2018-09-19 19:06:03 +08:00
xuechaos
e7fe123a27 Merge branch '0.2.1' of https://github.com/alibaba/nacos into v0.2.1 2018-09-18 22:26:54 +08:00
nkorange
52c306ae65 Adjust for jdk 1.7 2018-09-18 20:32:55 +08:00
hxy1991
59b6562e0d Fix #62 2018-09-18 20:27:50 +08:00
nkorange
d7c35b4953 Fix #59 2018-09-18 15:49:57 +08:00
xxc
a976d37808
Update pom.xml 2018-09-17 23:13:14 +08:00
xuechaos
71c4c43e27 update pom 2018-09-17 23:08:31 +08:00