nkorange
|
e9ddfd7e29
|
#502 Receive data sync
|
2019-01-21 14:28:59 +08:00 |
|
yanlinly
|
a63910940a
|
Merge pull request #666 from wfnuser/enhancement/login-ui-enhancement
fix the style
|
2019-01-21 14:18:47 +08:00 |
|
wfnuser
|
bd063d283d
|
fix the style
|
2019-01-21 14:10:47 +08:00 |
|
Fury Zhu
|
ad4f63ebe4
|
Merge pull request #664 from paderlol/develop
Fix update instance info NPE #663
|
2019-01-20 22:04:57 +08:00 |
|
zhanglong
|
25e4b86755
|
Fix update instance info NPE #663
|
2019-01-20 21:49:20 +08:00 |
|
nkorange
|
330fc4e6dc
|
#502 Partition consistency start coding
|
2019-01-20 20:55:43 +08:00 |
|
nkorange
|
f2b43fb240
|
#502 Update author information
|
2019-01-19 21:23:35 +08:00 |
|
nkorange
|
bf80ff1622
|
#650 Add ServerListManager
|
2019-01-19 18:24:50 +08:00 |
|
pader
|
6963301441
|
Merge pull request #2 from alibaba/develop
merge latest code
|
2019-01-19 12:04:11 +08:00 |
|
TsingLiang
|
04f067b86d
|
Merge pull request #652 from alibaba/feature_metrics
Feature metrics
|
2019-01-18 20:42:43 +08:00 |
|
qingliang.ql
|
80bf9717cd
|
add url
|
2019-01-18 14:26:32 +08:00 |
|
qingliang.ql
|
def3c196a1
|
add url
|
2019-01-18 14:24:53 +08:00 |
|
nkorange
|
d064fe36bb
|
Merge branch 'develop' into feature_naming_ap
|
2019-01-18 11:38:20 +08:00 |
|
Fury Zhu
|
780bd18f1a
|
Merge pull request #647 from alibaba/feature_multi_tenant
Fix CMDB JVM option error
|
2019-01-18 11:13:31 +08:00 |
|
nkorange
|
47b7423153
|
Merge branch 'develop' into feature_multi_tenant
|
2019-01-18 10:58:30 +08:00 |
|
nkorange
|
a889642ca9
|
Fix CMDB JVM option error in JDK 9
|
2019-01-18 10:57:44 +08:00 |
|
Keep
|
ed4c41fdad
|
Merge pull request #642 from wuyoushan/fix_jwtAuth_npe
fix JwtAuthenticationTokenFilter NPE bug
|
2019-01-18 10:40:22 +08:00 |
|
Keep
|
606bd1d47b
|
Merge pull request #641 from wuyoushan/remove_useless_semicolon
remove useless semicolon
|
2019-01-18 10:30:50 +08:00 |
|
yanlinly
|
489efb3292
|
Merge pull request #644 from alibaba/develop
0.8.0-SNAPSHOT
|
2019-01-17 23:37:10 +08:00 |
|
yanlinly
|
a6666582bd
|
Merge branch 'master' into develop
|
2019-01-17 23:15:24 +08:00 |
|
wuyoushan
|
e589b29351
|
fix JwtAuthenticationTokenFilter NPE bug
|
2019-01-17 20:39:20 +08:00 |
|
zhichen
|
5f9790962b
|
build js
|
2019-01-17 19:54:49 +08:00 |
|
zhichen
|
98454d6abd
|
fix namespace bugs
|
2019-01-17 19:51:08 +08:00 |
|
nkorange
|
38e84cfb62
|
#502 Fix PMD
|
2019-01-17 19:50:57 +08:00 |
|
wuyoushan
|
938666c7b8
|
remove useless semicolon
|
2019-01-17 18:02:44 +08:00 |
|
nkorange
|
cc1f6647b0
|
#502 Fix error log print
|
2019-01-17 17:12:44 +08:00 |
|
nkorange
|
0e76f55a3f
|
#502 Fix health check processor inject bean failed problem
|
2019-01-17 16:42:15 +08:00 |
|
water.lyl
|
920ff30961
|
Fix HmacSHA256 not available，change -Djava.ext.dirs
|
2019-01-17 16:39:38 +08:00 |
|
zhichen
|
8f5c6b0b3e
|
update i18n
|
2019-01-17 10:56:32 +08:00 |
|
nkorange
|
806e7030d2
|
#502 Fix bean inject error
|
2019-01-17 10:15:51 +08:00 |
|
water.lyl
|
fcbb582e53
|
1、Fix HmacSHA256 not available，change -Djava.ext.dirs
2、update jjwt to newest version
3、longger security key,and change hs512 to hs256
|
2019-01-16 22:54:51 +08:00 |
|
yanlinly
|
3149aabfc4
|
Merge pull request #632 from wfnuser/enhancement/login-ui-enhancement
Enhancement/login ui enhancement
|
2019-01-16 22:39:34 +08:00 |
|
wfnuser
|
4d711788a5
|
fix styles of login page
|
2019-01-16 20:14:29 +08:00 |
|
nkorange
|
7fa9c3afee
|
#502 merge code
|
2019-01-16 18:24:06 +08:00 |
|
nkorange
|
980e2a62ef
|
Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
# naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftCore.java
# naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftStore.java
# naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
# naming/src/main/java/com/alibaba/nacos/naming/core/VirtualClusterDomain.java
# naming/src/main/java/com/alibaba/nacos/naming/misc/Switch.java
# naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
|
2019-01-16 18:12:54 +08:00 |
|
Fury Zhu
|
07d92f6174
|
Merge pull request #628 from alibaba/feature_multi_tenant
Feature multi tenant
|
2019-01-16 15:08:55 +08:00 |
|
nkorange
|
5c7b2a2690
|
Merge branch 'develop' into feature_multi_tenant
|
2019-01-16 14:54:08 +08:00 |
|
nkorange
|
dee6857d28
|
#498 fix bug
|
2019-01-16 14:52:18 +08:00 |
|
LoadChange
|
65d9ecf421
|
Update fe build
|
2019-01-16 11:39:37 +08:00 |
|
LoadChange
|
ceb86d61a1
|
fix: API request method
|
2019-01-16 11:38:26 +08:00 |
|
nkorange
|
b5f09f63db
|
#502 make build pass
|
2019-01-16 10:46:22 +08:00 |
|
LoadChange
|
a4b1e38ff6
|
Update fe build
|
2019-01-15 21:20:04 +08:00 |
|
LoadChange
|
f19a67fca6
|
fix: fe done #498
|
2019-01-15 21:18:36 +08:00 |
|
xiaochun.xxc
|
9e652a21df
|
Revert "service list testcases"
This reverts commit 94eb697e45.
|
2019-01-15 19:27:55 +08:00 |
|
xiaochun.xxc
|
5c4662ae48
|
Revert "rename service list IT case"
This reverts commit eb83e7607f.
|
2019-01-15 19:26:11 +08:00 |
|
xiaochun.xxc
|
e9f0b548c9
|
Revert "add api testcases”"
This reverts commit 63c704a1eb.
|
2019-01-15 19:25:33 +08:00 |
|
nkorange
|
425a80167b
|
Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
# naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
|
2019-01-15 18:15:55 +08:00 |
|
mingyixu
|
6b02614856
|
Merge pull request #626 from alibaba/master
add service list testcase
|
2019-01-15 17:02:03 +08:00 |
|
mingyixu
|
a689f0f694
|
Merge branch 'develop' into master
|
2019-01-15 17:00:43 +08:00 |
|
Fury Zhu
|
663ed1a2f7
|
Merge pull request #627 from alibaba/feature_multi_tenant
Feature multi tenant
|
2019-01-15 16:26:28 +08:00 |
|