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
|
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 |
|
mercyblitz
|
91e8795486
|
Polish alibaba/nacos#94 : fixed logback missing
|
2018-10-03 05:10:39 +08:00 |
|
mercyblitz
|
0424a4a1db
|
Polish alibaba/nacos#94 : adapter modular logback whether current application is Spring or Spring Boot
|
2018-10-03 04:00:33 +08:00 |
|
mercyblitz
|
8a73c805d8
|
Polish alibaba/nacos#110 : remove application.properties and copy to META-INF/nacos-default.properties
|
2018-10-03 01:18:09 +08:00 |
|
mercyblitz
|
700a755ac5
|
Polish alibaba/nacos#109 : Exclude DataSourceAutoConfiguration using externalized configuration
|
2018-10-02 21:50:59 +08:00 |
|
mercyblitz
|
11204f8df6
|
Polish alibaba/nacos#108 : Remove duplicated banner.txt in sub-modules and move one into core module
|
2018-10-02 21:05:56 +08:00 |
|
mercyblitz
|
c4374dbf4e
|
Polish alibaba/nacos#94 : fixed the grammar of logback xml files
|
2018-10-02 18:21:54 +08:00 |
|
mercyblitz
|
adaf5f54d1
|
Polish alibaba/nacos#95 : add "standalone" profile
|
2018-10-02 11:20:54 +08:00 |
|
mercyblitz
|
c0a25c148a
|
Polish alibaba/nacos#105
|
2018-10-01 22:54:37 +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 |
|
mercyblitz
|
be8f3c2052
|
Polish alibaba/nacos#103
|
2018-10-01 10:58:27 +08:00 |
|
mercyblitz
|
a718c84d4c
|
Polish alibaba/nacos#104
|
2018-10-01 10:48:34 +08:00 |
|
xiaomage
|
421e9a347f
|
Bug fix
|
2018-10-01 10:00:29 +08:00 |
|
mercyblitz
|
4f273e70c5
|
Add Configurations for Database
|
2018-10-01 00:12:31 +08:00 |
|
mercyblitz
|
ae0feb80f4
|
Move the location of SQL scripts for code
|
2018-09-30 20:55:20 +08:00 |
|
mercyblitz
|
7b2549131b
|
Move the location of SQL scripts
|
2018-09-30 20:54:43 +08:00 |
|
mercyblitz
|
85df9e077f
|
Fixed alibaba/nacos#98
|
2018-09-30 16:41:40 +08:00 |
|
hxy1991
|
77a162d671
|
Fix #92
|
2018-09-30 11:08:49 +08:00 |
|
hxy1991
|
d3013f800a
|
Merge branch 'upstream'
|
2018-09-28 16:06:26 +08:00 |
|