Commit Graph

519 Commits

Author SHA1 Message Date
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
xuechaos
27de9642d0 update pom remove spring boot in parent 2018-09-17 22:49:48 +08:00
nkorange
1ca8a65234 Fix naming client throws exception when the service contains empty instance list. 2018-09-17 19:39:00 +08:00
xxc
74fb38ec96
Update README.md
update readme doc
2018-09-16 19:22:53 +08:00
mercyblitz
1145260d64 Update 0.2.1 and refactor some APIs 2018-09-15 13:50:25 +08:00
xxc
1f2752c8bf
Update README.md
fix mail
2018-09-15 01:09:36 +08:00
xxc
bd4dc6cbbf
Update CHANGELOG.md
update Change Log
2018-09-14 20:21:09 +08:00
xxc
797db1b918
Merge pull request #54 from alibaba/v0.2
V0.2
Closes #43 #44 #48 #47 #46
2018-09-14 20:15:04 +08:00
water.lyl
a29bf2436f [motify info] static resource not statble, remove static resource. 0.3 realease static resource again 2018-09-14 18:14:14 +08:00
mercyblitz
05b5425d59 Merge Other APIs 2018-09-14 15:31:19 +08:00
water.lyl
978bb024d7 [motify info] Streamlining packet dependencies 2018-09-13 21:57:44 +08:00
water.lyl
fdab9b7991 [motify info] file exist , then delete 2018-09-13 21:36:25 +08:00
water.lyl
1083a55677 [modify info] fix notify unhealth problem 2018-09-13 20:29:49 +08:00
water.lyl
8c7dcd7bb3 [motify info] config health info 2018-09-13 17:55:53 +08:00
water.lyl
89c5c8fd76 [motify info] Resolve code conflicts 2018-09-13 17:23:04 +08:00
water.lyl
de1d976432 Merge remote-tracking branch 'origin/0.3.0' into v0.2
* origin/0.3.0: (32 commits)
  [modify info] restruct equal name to void conflict
  [motify info] fix pmd
  [motify info] Api split
  fix bug and change some input style
  fix: modify wrong code
  [motify info] fix rollback problem
  update code
  [motify info] push web ui,and build shell
  gitignore add build dir
  fix: setParams decode bug
  [motify info] push static result
  [motify info] fix edit info
  [motify info] push build result,and fix namespace undefined problem
  fix tags bug
  update add index.css
  [motify info] mix useful
  [motify info] push core ui
  feat: add i18n feature
  替换白底logo
  update: update header css
  ...
2018-09-13 15:48:24 +08:00
nkorange
8d095f5011 Update get server status method 2018-09-13 15:31:48 +08:00
nkorange
4bc2b1fa97 Update server health method name 2018-09-13 14:18:42 +08:00
water.lyl
2986620fef [modify info] restruct equal name to void conflict 2018-09-13 13:19:29 +08:00
water.lyl
eb74cd6a36 [motify info] fix pmd 2018-09-13 11:37:50 +08:00
water.lyl
8719aea7c7 [motify info] Api split 2018-09-13 11:30:25 +08:00
zhichen
3be712c28e resolve conflict 2018-09-12 21:33:28 +08:00
zhichen
a7d4b559bd fix bug and change some input style 2018-09-12 21:25:31 +08:00
zhichen
b352f614f2 fix: modify wrong code 2018-09-12 21:09:43 +08:00
water.lyl
ef18f08c74 [motify info] fix rollback problem 2018-09-12 15:55:16 +08:00
nkorange
8b295159d1 Add server healthy method 2018-09-12 15:19:05 +08:00
zhichen
48fdb4d52b update code 2018-09-12 15:15:29 +08:00