superman
6c9edc1778
Merge pull request #4351 in CORE/base-third from release/11.0 to feature/x
...
* commit 'd5cdc2ce3922e820774422a240b1b129dae395f8':
3 years ago
superman
d5cdc2ce39
Merge pull request #4346 in CORE/base-third from release/10.0 to release/11.0
...
* commit '453f7d215f6a51df6506b55487978007e6d657fa':
3 years ago
superman
453f7d215f
Merge pull request #4339 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'd4e8891270a7673318cd0dfadd19b9daca01406a':
3 years ago
superman
d4e8891270
Merge pull request #4336 in CORE/base-third from release/10.0 to final/10.0
...
* commit 'b699edc67ddff3964ae9d41c2ad03e429d96941b':
DEC-20671 fix: was下请求服务器数据失败
DEC-21348 fix: java security适配
3 years ago
superman
b699edc67d
Merge pull request #4335 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '4525a480b12e083e180d76d9e47d933181faac5a':
3 years ago
lidongy
c460b7a8c5
Pull request #4314 : KERNEL-9836 update: alibaba druid 版本升级
...
Merge in CORE/base-third from ~LIDONGY/base-third:feature/x to feature/x
* commit '2f1fd14c7e3736d975d6a2bdb76fd3783bc74317':
KERNEL-9836 update: alibaba druid 版本升级
3 years ago
lidongy
2f1fd14c7e
KERNEL-9836 update: alibaba druid 版本升级
3 years ago
superman
1b483b52f2
Merge pull request #4313 in CORE/base-third from release/11.0 to feature/x
...
* commit '4cf424329b50296c8e9bb9ce2c95f0e64f9aa365':
3 years ago
superman
4cf424329b
Merge pull request #4312 in CORE/base-third from final/11.0 to release/11.0
...
* commit '0e86496a24b06d4d579a76b3190d5b6c3be39731':
3 years ago
superman
0e86496a24
Merge pull request #4311 in CORE/base-third from persist/11.0 to final/11.0
...
* commit '6e706cd862333aad7373269c96e5b64587831f89':
3 years ago
superman
6e706cd862
Merge pull request #4303 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '54d74d7d457a35648072f93af2fb52cdfd355eae':
3 years ago
superman
224cec73fb
Merge pull request #4292 in CORE/base-third from release/11.0 to feature/x
...
* commit 'cf45b645e8a46bebf9a37cf9c62297273ab4d4d5':
3 years ago
superman
cf45b645e8
Merge pull request #4291 in CORE/base-third from final/11.0 to release/11.0
...
* commit '54d74d7d457a35648072f93af2fb52cdfd355eae':
3 years ago
superman
54d74d7d45
Merge pull request #4290 in CORE/base-third from persist/11.0 to final/11.0
...
* commit '88cceda7ec87fafbbe65ec9e31c203d33ee7724e':
3 years ago
superman
b946cb2fa6
Merge pull request #4287 in CORE/base-third from release/10.0 to release/11.0
...
* commit 'a61a10fb2c1d95478fd53c50c61669bfb44f68fd':
3 years ago
superman
4525a480b1
Merge pull request #4286 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'a61a10fb2c1d95478fd53c50c61669bfb44f68fd':
3 years ago
superman
a61a10fb2c
Merge pull request #4285 in CORE/base-third from final/10.0 to release/10.0
...
* commit '0ccd2d1705ff3c1019ee56a690ac2641dd1cf74c':
3 years ago
superman
0ccd2d1705
Merge pull request #4284 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '64c35029e6e8ddc82bcc6d9d2d4c4f23dc254682':
3 years ago
superman
64c35029e6
Merge pull request #4282 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'e0f1ac4dcb1a6c7849b7d12f837bcc97c0989e22':
3 years ago
superman
88cceda7ec
Merge pull request #4281 in CORE/base-third from final/11.0 to persist/11.0
...
* commit '7511a3f8d0d672c1a80935c71b7b96ef46794894':
3 years ago
superman
85b6638052
Merge pull request #4260 in CORE/base-third from release/11.0 to feature/x
...
* commit 'a0011f9c5bac90730e8bdbee81d3672a75c808d9':
3 years ago
superman
a0011f9c5b
Merge pull request #4259 in CORE/base-third from final/11.0 to release/11.0
...
* commit '7511a3f8d0d672c1a80935c71b7b96ef46794894':
3 years ago
superman
7511a3f8d0
Merge pull request #4258 in CORE/base-third from persist/11.0 to final/11.0
...
* commit '2e4fda1e2b0edf61a2f43e69b5b2c5bb6cb7c1d1':
3 years ago
superman
0c86aa30f8
Merge pull request #4249 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'd437da7a205f93ce533004f00e404bcefebabc4c':
3 years ago
superman
2e4fda1e2b
Merge pull request #4245 in CORE/base-third from final/11.0 to persist/11.0
...
* commit 'c9c0efca29dc92f5d7997aeefe0c22fadfa00562':
Revert "DEC-21348 fix: java security适配"
DEC-21348 fix: java security适配
Revert "DEC-21348 fix: java security适配"
Revert "DEC-21348 fix: java security适配"
Revert "DEC-21348 fix: java security适配"
DEC-21348 fix: java security适配
REPORT-60245 fix: TongWeb启动失败
3 years ago
superman
1cf07522b3
Merge pull request #4244 in CORE/base-third from release/11.0 to feature/x
...
* commit '850cfe1db35dda890fb644a0965200e06e3d175a':
DEC-20671 fix: was下请求服务器数据失败
3 years ago
superman
850cfe1db3
Merge pull request #4239 in CORE/base-third from release/10.0 to release/11.0
...
* commit 'd437da7a205f93ce533004f00e404bcefebabc4c':
DEC-20671 fix: was下请求服务器数据失败
3 years ago
superman
d437da7a20
Merge pull request #4234 in CORE/base-third from feature/10.0 to release/10.0
...
* commit 'bed893a89aff637b21b299a4479a561502c754ec':
3 years ago
superman
6869107b77
Merge pull request #4238 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '26748dd4730ebc9d7b00dde5bc0d530add0b1ec2':
DEC-20671 fix: was下请求服务器数据失败
3 years ago
Cloud.Liu
26748dd473
Pull request #4223 : DEC-20671 fix: was下请求服务器数据失败
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit 'e90d644b999ff908decd3268a367963824a8862b':
DEC-20671 fix: was下请求服务器数据失败
3 years ago
Cloud.Liu
e90d644b99
DEC-20671 fix: was下请求服务器数据失败
3 years ago
superman
01a642eb5f
Merge pull request #4212 in CORE/base-third from release/11.0 to feature/x
...
* commit '8d90b00c480718e09fb865b92c567b31b6987a4d':
Revert "DEC-21348 fix: java security适配"
3 years ago
superman
8d90b00c48
Merge pull request #4211 in CORE/base-third from final/11.0 to release/11.0
...
* commit 'c9c0efca29dc92f5d7997aeefe0c22fadfa00562':
3 years ago
superman
c9c0efca29
Merge pull request #4202 in CORE/base-third from release/11.0 to final/11.0
...
* commit 'f235bd524a4df12eec045bfd17e7c3fab4853d4e':
Revert "DEC-21348 fix: java security适配"
DEC-21348 fix: java security适配
Revert "DEC-21348 fix: java security适配"
Revert "DEC-21348 fix: java security适配"
Revert "DEC-21348 fix: java security适配"
DEC-21348 fix: java security适配
REPORT-60245 fix: TongWeb启动失败
3 years ago
Cloud.Liu
f235bd524a
Pull request #4201 : 无JIRA任务 revert: java security适配
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/11.0 to release/11.0
* commit '49f4901002f0d75d7f0f50830219b7be241725ba':
Revert "DEC-21348 fix: java security适配"
3 years ago
Cloud.Liu
49f4901002
Revert "DEC-21348 fix: java security适配"
...
This reverts commit f3d9c60d87
.
3 years ago
superman
e2c6eaa69f
Merge pull request #4200 in CORE/base-third from release/11.0 to feature/x
...
* commit '1648698d336c7df51b3a89f345a936d21c6be2d6':
DEC-21348 fix: java security适配
3 years ago
superman
bed893a89a
Merge pull request #4196 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'dcaba51fbd3274ea365aa4c0497d0e7388046151':
DEC-21348 fix: java security适配
3 years ago
superman
1648698d33
Merge pull request #4195 in CORE/base-third from release/10.0 to release/11.0
...
* commit 'd2514e9e61ebeee6ef079ce3a88c4fdcb4021303':
DEC-21348 fix: java security适配
3 years ago
superman
dcaba51fbd
Merge pull request #4194 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'd2514e9e61ebeee6ef079ce3a88c4fdcb4021303':
DEC-21348 fix: java security适配
3 years ago
Cloud.Liu
d2514e9e61
Pull request #4160 : DEC-21348 fix: java security适配
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit 'f3d9c60d875e898fc3898e18b3368b608b5c78a4':
DEC-21348 fix: java security适配
3 years ago
superman
a5999fc263
Merge pull request #4186 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '58048fd89546a7eee469f2beb74b56dc1eb9056e':
3 years ago
superman
58048fd895
Merge pull request #4175 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'b14733d9e2cf817740f4ecf3e9e693e72508e844':
3 years ago
superman
948db39903
Merge pull request #4181 in CORE/base-third from release/11.0 to feature/x
...
* commit 'afe40313af258e08cc5a00227fedec3c8cd75c14':
3 years ago
superman
afe40313af
Merge pull request #4176 in CORE/base-third from release/10.0 to release/11.0
...
* commit 'b14733d9e2cf817740f4ecf3e9e693e72508e844':
3 years ago
superman
b14733d9e2
Merge pull request #4174 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'e0f1ac4dcb1a6c7849b7d12f837bcc97c0989e22':
3 years ago
superman
e0f1ac4dcb
Merge pull request #4173 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '666dcd1616bad40ee0e27670aa07c0c123ee98f8':
3 years ago
superman
666dcd1616
Merge pull request #4166 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'e14db4b6e586618034909fd6cc18114d2596183d':
Revert "DEC-21348 fix: java security适配"
DEC-21348 fix: java security适配
3 years ago
Cloud.Liu
f3d9c60d87
DEC-21348 fix: java security适配
3 years ago
lidongy
23ab285be5
Pull request #4102 : KERNEL-9700 update: netty-socket.io框架需要升级到最新的版本
...
Merge in CORE/base-third from ~LIDONGY/base-third:feature/x to feature/x
* commit '6e5b5ef1dfbd5f02108ce8323e82cab8096f69d7':
KERNEL-9700 update: netty-socket.io框架需要升级到最新的版本
3 years ago