qingliang.ql
4101814db6
add license
2019-01-09 12:05:14 +08:00
qingliang.ql
fb5bbf3689
merge develop
2019-01-09 11:27:51 +08:00
qingliang.ql
4bcf4313e3
collect metrics to metrics monitor
2019-01-09 10:35:24 +08:00
qingliang.ql
d4821d6460
config metrics
2019-01-07 20:44:16 +08:00
FrankBian
41001899db
format code: add @Override; translate some chinese msg to english; remove unneccessary method modifier
2019-01-07 15:48:01 +08:00
nkorange
be64c1acf7
Update version to 0.7.0
2018-12-14 17:48:57 +08:00
qingliang.ql
505252cb60
Fixes #395
2018-12-13 21:16:04 +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
hxy1991
97743685ac
Fixes #363
2018-12-10 19:53:15 +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
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
hxy1991
cbc8b0a75a
Merge branch 'upstream-develop'
...
# Conflicts:
# api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
# config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java
2018-12-03 10:29:40 +08:00
hxy1991
30e7c5273a
Fixes #363
2018-12-01 13:57:03 +08:00
nkorange
e3e6682231
Modify author info
2018-11-30 13:25:58 +08:00
hxy1991
09f2da0382
Restore index names for compatibility
2018-11-28 10:23:04 +08:00
hxy1991
631d2e49a1
Merge branch 'upstream-master'
2018-11-20 16:30:42 +08:00
hxy1991
0e24b70642
Fixes #316
2018-11-20 14:22:41 +08:00
hxy1991
94dd0e5609
Merge branch 'upstream-master'
2018-11-20 14:02:40 +08:00
dungu.zpf
d795ad7d2b
0.5.0 release
2018-11-19 19:54:08 +08:00
nkorange
93246b3ded
Merge branch 'naming-model-refactor' into develop
...
# Conflicts:
# console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js
# console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
# naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2018-11-16 19:59:15 +08:00
Fury Zhu
ea03905ae9
Merge branch 'master' into naming-model-refactor
2018-11-16 18:16:51 +08:00
hxy1991
9ab50bbc87
Fixes #255
2018-11-16 14:59:05 +08:00
hxy1991
af21897608
correct license
2018-11-16 10:28:28 +08:00
hxy1991
0d90d6e895
Fixes #222 #231
2018-11-07 18:20:09 +08:00
yanlinly
608104c993
Merge pull request #212 from hxy1991/master
...
Fixes #92
2018-11-05 20:44:22 +08:00
water.lyl
7fdd80cc31
update version to 0.4.0
2018-11-05 20:34:37 +08:00
hxy1991
adc7ecfe48
Merge branch 'upstream-develop'
2018-11-05 18:29:23 +08:00
water.lyl
db8e97bd35
Fix #216
2018-11-05 15:45:36 +08:00
hxy1991
7c626eb4f8
Fixes #92
2018-11-02 18:26:24 +08:00
yanlinly
24a2ede65f
Merge pull request #194 from yanlinly/master
...
Fix #38 #106 #188
2018-10-31 09:39:22 +08:00
Keep
ede4111300
Merge pull request #152 from hxy1991/master
...
fixes #92
2018-10-30 21:16:09 +08:00
nkorange
aa7e2e41e7
remove ip use weak raft
2018-10-30 16:16:01 +08:00
water.lyl
9d70f720ca
Fix #188
2018-10-30 15:55:06 +08:00
xuechaos
077c4cdb6f
release Nacos 0.3.0, update version to 0.3.0
2018-10-26 21:55:05 +08:00
xuechaos
9275dd7c24
update copyright
2018-10-25 19:02:32 +08:00
nkorange
abdc48fc84
Fix register instance with customized cluster name failed bug.
2018-10-25 15:56:02 +08:00
hxy1991
c854236a8e
fixes #92
2018-10-24 19:53:28 +08:00
wyp12
5cc9137d66
update
2018-10-23 14:56:26 +08:00
xuechaos
1fbcf24521
update 0.3.0-RC1 uppercase letter
2018-10-19 18:36:29 +08:00
mercyblitz
cc616f8d6d
Revert Constants.java & testcase
2018-10-19 11:00:37 +08:00
nkorange
534995a405
Resolve conflicts
2018-10-18 18:59:45 +08:00
nkorange
baa8594fe7
Merge branch 'master' into 0.3.0
...
# Conflicts:
# api/pom.xml
# config/pom.xml
# config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
# console/pom.xml
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
# naming/src/main/resources/application.properties
2018-10-18 17:11:32 +08:00
wyp12
251b2f01d8
merge master
2018-10-17 19:45:35 +08:00
mercyblitz
8f7c743a00
Fixed test cases
2018-10-17 16:39:12 +08:00
mercyblitz
c0ee2f2764
Polish to resolve compilation issue
2018-10-15 17:17:25 +08:00
小马哥
5c3ebf8f9f
Merge branch 'master' into 0.2.2
2018-10-15 17:10:48 +08:00
hxy1991
074d6aa77a
Fix #119
2018-10-09 20:23:33 +08:00
小马哥
55433f0995
Merge pull request #23 from javartisan/master
...
improving code quality
2018-10-09 10:13:58 +08:00
xiaomage
8d55b3fd33
Bug fix
2018-10-05 19:51:20 +08:00
mercyblitz
e08dca3d75
Polish alibaba/nacos#111 : Replace config module
2018-10-04 00:47:46 +08:00