zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
695 Commits 2 Branches 3 Tags 58 MiB
33e5e47832
Commit Graph

695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuwenlong
4fba53d159 Fixes #435 2018-12-12 22:14:16 +08:00
hxy1991
ff55be27d3 Merge branch 'anjia0532-master' into upstream-develop 
# Conflicts:
#	console/src/main/resources/diamond-server-logback.xml
 2018-12-11 19:17:43 +08:00
nkorange
308867f0e2 Remove unused config 2018-12-11 17:41:51 +08:00
nkorange
a5e564dbe5 Update version to 0.6.1 2018-12-11 17:15:57 +08:00
Fury Zhu
9b4732d3ac
Merge pull request #433 from hxy1991/0.6.1 
[ISSUE #123] When packing nacos-core, ${user.home} is replaced in the logback configuration file (nacos.xml)
 2018-12-11 16:47:36 +08:00
hxy1991
0facefe9c3 Fixes #432 2018-12-11 16:44:26 +08:00
Fury Zhu
72ff44e81f
Merge pull request #431 from hxy1991/master 
[ISSUE #430] Remove redundant logback configuration files
 2018-12-11 16:36:54 +08:00
nkorange
1b3c5fb4ba Prepare for 0.6.1 2018-12-11 16:34:43 +08:00
nkorange
8c50599a15 #429 Filter services by metadata 2018-12-11 16:10:48 +08:00
hxy1991
5efed006ac Fixes #430 2018-12-11 14:40:07 +08:00
xxc
0d92ea71c1
Merge pull request #426 from hxy1991/master 
[ISSUE #363] Use "4 space" instead of "tab" for indent
 2018-12-10 21:11:17 +08:00
hxy1991
e4e9574379 exclude .editorconfig when running apache-rat:check 2018-12-10 20:19:30 +08:00
hxy1991
97743685ac Fixes #363 2018-12-10 19:53:15 +08:00
nkorange
7115834a98 #421 Fixed 2018-12-10 19:52:58 +08:00
hxy1991
2f630b0be6 Merge remote-tracking branch 'upstream/develop' into upstream-develop 2018-12-10 19:41:55 +08:00
Keep
5945fcba38
Merge pull request #418 from anjia0532/editorconfig 
[ISSUE #417] maintain consistent coding styles
 2018-12-10 19:41:36 +08:00
nkorange
3198ec69ca #187 Refactor some logic 2018-12-10 15:37:48 +08:00
hxy1991
acffddd164 Merge branch 'upstream-master' into upstream-develop 2018-12-09 16:17:44 +08:00
anjia0532
f5c1b78f16 added editorconfig to maintain consistent coding styles. 
more infos https://editorconfig.org/
 2018-12-09 14:38:03 +08:00
anjia0532
99bdf41245 Revert "added editorconfig to maintain consistent coding styles. more infos https://editorconfig.org/" 
This reverts commit f9f46670
 2018-12-09 14:04:14 +08:00
anjia0532
f9f4667032 added editorconfig to maintain consistent coding styles. 
more infos https://editorconfig.org/
 2018-12-09 13:57:17 +08:00
anjia0532
0c5654cec8 1. change charset to UTF-8(replace GBK or utf8) 
2. support custom nacos server logs path in application* profile(key:nacos.logs.path)
 2018-12-09 13:24:17 +08:00
zhichen
e7c14cc141
Merge pull request #415 from alibaba/hotfix_413 
fixed #413
 2018-12-07 23:06:31 +08:00
zhichen
7916583541
Merge pull request #414 from alibaba/hotfix_413 
fixed #413
 2018-12-07 23:06:12 +08:00
zhichen
11fc6729e5 fixed #413 2018-12-07 22:54:39 +08:00
xxc
862c3a32ec
Merge pull request #411 from alibaba/develop 
nacos 0.6.0 version release pull request
 2018-12-07 17:47:54 +08:00
xuechaos
b01e939e4e update changelog to 0.6.0 release 2018-12-07 17:29:30 +08:00
王彦民
771b129a19 Update: fe release 0.6 2018-12-07 15:39:55 +08:00
王彦民
68e72748b0 update: Build the page 2018-12-07 15:39:55 +08:00
王彦民
d8c7800a00 Update: fe release 0.6 2018-12-07 15:25:49 +08:00
xuechaos
d4edde980b Nacos release 0.6.0 version 
#388 Cluster name should be provided in the Instance
#377 Clean up messy code in Naming module
#369 Support instance list persisted on disk
#366 findbugs-maven-plugin version
#362 The metadata will lost when online or offline instance through web ui
#352 Refactoring internationalization Nacos console
#278 Nacos docker img
#243 optimize the efficiency of integration testing, it’s taking too long now
 2018-12-07 15:19:43 +08:00
王彦民
a4a74dbe9d update: Build the page 2018-12-07 14:58:10 +08:00
xuechaos
b39733e463 findbugs-maven-plugin version to 3.0.4 
issue #366
 2018-12-07 14:31:31 +08:00
xuechaos
3ab06bc1dd Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2018-12-07 14:30:11 +08:00
王彦民
baa79164e2 fix: closes #353 2018-12-07 14:11:52 +08:00
nkorange
0409aaecb0 #187 Add Java docs 2018-12-07 11:24:22 +08:00
nkorange
7d2f652b36 #187 Refactor selector 2018-12-06 20:14:07 +08:00
mingyixu
ea1e8ab9dc
Merge pull request #394 from mingyixu/master 
[ISSUE #243]fix Integration testing too long
 2018-12-06 19:42:29 +08:00
zhichen
9425a53124
Merge pull request #355 from jameslcj/hotfix_337 
validate config syntax #337
 2018-12-06 15:20:00 +08:00
xxc
f431291e69
Merge branch 'master' into develop 2018-12-06 15:02:07 +08:00
王彦民
2ef2e5a5c6 fix: closes #362 2018-12-06 11:01:42 +08:00
xxc
91dca4a3b9
Merge pull request #398 from hxy1991/master 
Fixes #391 Fixes #229
 2018-12-06 11:01:11 +08:00
zhichen
52fe7d52c1
Merge branch 'develop' into hotfix_337 2018-12-06 10:38:21 +08:00
hxy1991
1ca774b42c Fixes #391 2018-12-05 22:50:52 +08:00
hxy1991
25819dce28 Fixes #229 2018-12-05 22:36:33 +08:00
hxy1991
6deb418c36 Fixes #391 2018-12-05 21:41:03 +08:00
hxy1991
190ac8d057 Fixes #391 2018-12-05 20:33:50 +08:00
mingyixu
c634ff8da2 [ISSUE #243]fix Integration testing too long 2018-12-05 18:56:34 +08:00
mingyixu
e15e902975 [ISSUE #243]fix Integration testing too long 2018-12-05 17:29:48 +08:00
JianweiWang
3f5955f69c
Merge pull request #392 from alibaba/hotfix_cluster_lost_in_instance 
Hotfix cluster lost in instance
 2018-12-05 17:08:48 +08:00