wfnuser
973c522834
fix conflict
2019-01-15 12:48:28 +08:00
water.lyl
917ab72ca1
Fix #381 fix build problem
2019-01-15 11:47:14 +08:00
nkorange
d0bfc0e179
Merge branch 'feature_multi_tenant' into feature_naming_ap
...
# Conflicts:
# naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
# naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
# naming/src/main/java/com/alibaba/nacos/naming/healthcheck/MysqlHealthCheckProcessor.java
# naming/src/main/java/com/alibaba/nacos/naming/healthcheck/TcpSuperSenseProcessor.java
# naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
# naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
2019-01-14 16:59:13 +08:00
nkorange
fdc48028fc
Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant
...
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
# client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
# naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
# naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
# naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
# naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
# naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
2019-01-14 16:01:14 +08:00
nkorange
baa4b4c1f1
#502 Update pom version
2019-01-13 10:26:23 +08:00
qingliang.ql
2a5df09a53
upgrade springboot
2019-01-07 20:30:24 +08:00
nkorange
fed3c3f986
#498 Rename healthController bean and update pom version to 0.8.0-SNAPSHOT
2019-01-07 17:57:13 +08:00
wfnuser
128e8bd0ae
init the jwt
2018-12-24 02:07:48 +08:00
nkorange
ffa9f92812
Merge branch 'develop' into 0.7.0
2018-12-14 20:02:37 +08:00
nkorange
be64c1acf7
Update version to 0.7.0
2018-12-14 17:48:57 +08:00
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
nkorange
7a64ce2177
#187 Fix bug
2018-12-14 17:00:18 +08:00
zhichen
bd979c24f9
update nacos-all
2018-12-14 13:52:58 +08:00
hxy1991
e4e9574379
exclude .editorconfig when running apache-rat:check
2018-12-10 20:19:30 +08:00
nkorange
3198ec69ca
#187 Refactor some logic
2018-12-10 15:37:48 +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
xuechaos
b39733e463
findbugs-maven-plugin version to 3.0.4
...
issue #366
2018-12-07 14:31:31 +08:00
nkorange
7d2f652b36
#187 Refactor selector
2018-12-06 20:14:07 +08:00
nkorange
aace49640a
#187 provide CMDB module
2018-12-05 12:08:49 +08:00
nkorange
78523976ba
#97 Support integrating to third-party CMDB to filter service providers by their labels.
2018-12-03 17:56:11 +08:00
nkorange
67ebd02408
Merge branch 'develop' into feature_cmdb
2018-12-03 09:52:32 +08:00
nkorange
a9fbc622a2
Add CMDB module
2018-11-22 20:31:53 +08:00
zhichen
5f4e149b00
remove redundant js
2018-11-22 14:29:48 +08:00
zhichen
227a5154fe
udpate: add some fe files to rat config
2018-11-20 15:18:29 +08:00
dungu.zpf
d795ad7d2b
0.5.0 release
2018-11-19 19:54:08 +08:00
nkorange
b99833cb50
Merge remote-tracking branch 'origin/develop' into develop
2018-11-16 20:34:44 +08:00
xuechaos
7b38731f54
feature : Maven build project Support JDK 11
...
issue #302
2018-11-16 19:59:27 +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
nkorange
57f2ae4eca
Update version
2018-11-16 19:41:19 +08:00
Fury Zhu
ea03905ae9
Merge branch 'master' into naming-model-refactor
2018-11-16 18:16:51 +08:00
xuechaos
0f51707171
fix maven-surefire-plugin args support jdk 1.8
2018-11-16 14:42:45 +08:00
xuechaos
b6e1ad91b8
feature : Support JDK 11
...
issue #214
2018-11-16 14:22:12 +08:00
nkorange
46c141900e
Fix PMD
2018-11-16 12:07:25 +08:00
hxy1991
c6a32e5357
Fixes "unapproved license" issue
2018-11-16 00:29:41 +08:00
nkorange
361ae0b2dd
Fix raft publish bug
2018-11-15 14:19:08 +08:00
yangyshdan
f6b39ed309
#166
2018-11-08 16:00:01 +08:00
water.lyl
7fdd80cc31
update version to 0.4.0
2018-11-05 20:34:37 +08:00
nkorange
aa7e2e41e7
remove ip use weak raft
2018-10-30 16:16:01 +08:00
xuechaos
077c4cdb6f
release Nacos 0.3.0, update version to 0.3.0
2018-10-26 21:55:05 +08:00
xuechaos
c32fbd9f65
update lisence header
2018-10-26 21:02:33 +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
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
xxc
b87efc470e
Merge pull request #140 from alibaba/0.3.0
...
0.3.0
2018-10-19 17:24:29 +08:00
hxy1991
43452229bf
update pom.xml for release client jar
2018-10-19 15:41:47 +08:00
nkorange
fa163631a1
Update version to 0.3.0-rc1
2018-10-18 23:06:42 +08:00
nkorange
534995a405
Resolve conflicts
2018-10-18 18:59:45 +08:00
wyp12
251b2f01d8
merge master
2018-10-17 19:45:35 +08:00
mercyblitz
3b5eb060e8
Polish alibaba/nacos#103
2018-10-01 12:15:21 +08:00
mercyblitz
83f536b27d
Polish alibaba/nacos#102
2018-10-01 11:43:48 +08:00
mercyblitz
99b5827409
Polish alibaba/nacos#101
2018-10-01 11:19:53 +08:00
xiaomage
421e9a347f
Bug fix
2018-10-01 10:00:29 +08:00
mercyblitz
85df9e077f
Fixed alibaba/nacos#98
2018-09-30 16:41:40 +08:00
hxy1991
04045bee77
Fix #91
2018-09-28 16:14:05 +08:00
nkorange
44cf03db2d
Update version to 0.2.1
2018-09-27 14:22:19 +08:00
nkorange
adafaf7086
Merge branch 'master' into 0.2.2
2018-09-26 21:20:22 +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
5dfd4b6451
update version
2018-09-26 19:59:41 +08:00
nkorange
b54a0a9b9d
Update version to 0.2.2-SNAPSHOT
2018-09-21 16:46:49 +08:00
hxy1991
357702afaa
Modify the version to 0.2.1-RC1
2018-09-21 15:46:53 +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
hxy1991
ee0575b1c2
Merge branch 'upstream' into 0.2.1
2018-09-19 21:17:22 +08:00
water.lyl
9839062d32
Fix #67
...
The configuration module log is changed to config
2018-09-19 19:15:54 +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
mercyblitz
1145260d64
Update 0.2.1 and refactor some APIs
2018-09-15 13:50:25 +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
water.lyl
8719aea7c7
[motify info] Api split
2018-09-13 11:30:25 +08:00
nkorange
6bc052153d
Update version to 0.2.0
2018-09-12 14:13:38 +08:00
xingxuechao
91d20f34fd
nacos is coming
2018-07-21 00:27:23 +08:00
