nkorange
|
d2e4f4e6b4
|
Merge branch 'feature_cmdb' into 0.7.0
# Conflicts:
# api/pom.xml
# api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java
# client/pom.xml
# client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
# common/pom.xml
# config/pom.xml
# console/pom.xml
# core/pom.xml
# distribution/conf/application.properties
# distribution/conf/nacos-logback.xml
# distribution/pom.xml
# distribution/release-nacos.xml
# example/pom.xml
# naming/pom.xml
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
# pom.xml
# test/pom.xml
|
2018-12-14 17:15:32 +08:00 |
|
zhichen
|
82ebb5c34f
|
Merge pull request #456 from jameslcj/hotfix_455
fix: #455
|
2018-12-14 17:05:02 +08:00 |
|
nkorange
|
7a64ce2177
|
#187 Fix bug
|
2018-12-14 17:00:18 +08:00 |
|
nkorange
|
a631ec3bf7
|
Fix #461
|
2018-12-14 16:23:04 +08:00 |
|
zhichen
|
bd979c24f9
|
update nacos-all
|
2018-12-14 13:52:58 +08:00 |
|
Keep
|
e623384b6a
|
Merge pull request #458 from alibaba/feature_stanalone_mysql
Fixes #395
|
2018-12-13 21:35:34 +08:00 |
|
zhichen
|
d8291244e9
|
fix: #455
|
2018-12-13 21:17:00 +08:00 |
|
qingliang.ql
|
505252cb60
|
Fixes #395
|
2018-12-13 21:16:04 +08:00 |
|
zhichen
|
abf4f9ba6e
|
fix: #455
|
2018-12-13 21:08:21 +08:00 |
|
zhichen
|
2f2404c14a
|
build js
|
2018-12-13 20:32:47 +08:00 |
|
zhichen
|
9200cbc329
|
fix 445
|
2018-12-13 20:29:24 +08:00 |
|
nkorange
|
f96794e170
|
#187 Fix bug
|
2018-12-13 20:01:07 +08:00 |
|
Fury Zhu
|
198c6a7541
|
Merge pull request #449 from loadchange/issues-393
Fixes #393
|
2018-12-13 19:50:18 +08:00 |
|
王彦民
|
6c1818a2b6
|
Update: public service
|
2018-12-13 19:09:42 +08:00 |
|
王彦民
|
261dd75f15
|
Update: build #393
|
2018-12-13 18:26:32 +08:00 |
|
王彦民
|
565ce81e34
|
fix: update instance
|
2018-12-13 18:19:20 +08:00 |
|
王彦民
|
bcfe37f912
|
Update: build #393
|
2018-12-13 17:48:18 +08:00 |
|
王彦民
|
d706b62e60
|
fix: Support operation of selector on console, #393
|
2018-12-13 17:13:44 +08:00 |
|
nkorange
|
5f6bdf2d39
|
Update expression syntax
|
2018-12-13 15:12:57 +08:00 |
|
王彦民
|
5490501838
|
Update: merge
|
2018-12-13 14:18:22 +08:00 |
|
Keep
|
19b8041bfd
|
Merge pull request #444 from foamfish/develop
[ISSUE #435] fix improper usage of words.
|
2018-12-13 11:21:28 +08:00 |
|
Zhen Tang
|
6fb97c44e7
|
Revert changes in HTTP header for backward compatibility.
|
2018-12-13 09:13:51 +08:00 |
|
Zhen Tang
|
98e447e146
|
Fix typo: Long pulling -> Long polling.
|
2018-12-13 09:13:28 +08:00 |
|
Zhen Tang
|
d5fcfc4a81
|
Fix typo: PushRecver -> PushReceiver
|
2018-12-13 09:13:05 +08:00 |
|
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 |
|