kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,324 Commits 1 Branch 0 Tags 166 MiB
Commit Graph

3324 Commits

Author SHA1 Message Date
吴晟 Wu Sheng 18a83ce414
Update NOTICE.txt 
Update year to 2018
 2018-01-14 10:07:06 +08:00
吴晟 Wu Sheng 657b1a2054
Merge pull request #747 from apache/ci-from-cache 
Ci from cache
 2018-01-13 22:53:13 +08:00
吴晟 Wu Sheng 33616bc5bd
Merge branch 'master' into ci-from-cache 2018-01-13 22:26:06 +08:00
Xin,Zhang 225e6bb9fc
Merge pull request #750 from peng-yongsheng/fixed/es_storage_bug 
Changed boolean type to integer, true: 1, false: 0.
 2018-01-13 17:31:45 +08:00
peng-yongsheng 79cddf659b Changed boolean type to integer, true: 1, false: 0. 2018-01-13 17:18:44 +08:00
Xin,Zhang cbcb592cee
Merge pull request #738 from YunaiV/master-5.0 
Concurrency conflicts in Spring plugin #735
 2018-01-13 15:09:44 +08:00
Xin,Zhang b5c4863258
Merge branch 'master' into master-5.0 2018-01-13 14:55:40 +08:00
吴晟 Wu Sheng 10ef53e6c2
Merge pull request #749 from peng-yongsheng/feature/storage_h2 
Feature/storage h2
 2018-01-13 07:31:38 +08:00
peng-yongsheng 5ba36ca6cb Unused import error when continuous integration. 2018-01-12 23:23:43 +08:00
peng-yongsheng c38e15d992 Merge branch 'master' into feature/storage_h2 2018-01-12 22:23:41 +08:00
peng-yongsheng 1b214beae7 Merge remote-tracking branch 'upstream/master' 2018-01-12 22:22:28 +08:00
peng-yongsheng 2609e27349 Alarm aggregate by h2 storage test successful. 2018-01-12 22:20:24 +08:00
peng-yongsheng 41082be5ea Application reference metric, Application metric, Instance reference metric, Instance metric, Service reference metric, Service metric pyramid aggregate by h2 storage test successful. 2018-01-12 17:00:47 +08:00
wu-sheng 5da5d059dd Rmove a download. 2018-01-12 16:03:19 +08:00
吴晟 Wu Sheng 9453c8c403
Merge branch 'master' into master-5.0 2018-01-12 15:41:54 +08:00
wu-sheng fdf4a6ea40 Fix typo. 2018-01-12 15:01:48 +08:00
wu-sheng 3cd03a720a Add Chinese document about building resin and ojdbc plugins. 2018-01-12 14:56:34 +08:00
wu-sheng 4a01c08dc4 Remove an install. 2018-01-12 14:22:01 +08:00
wu-sheng 79579ba85a Use maven repository resin 3 dependencies. 2018-01-12 12:01:45 +08:00
wu-sheng 7b505549db Fix wrong url. 2018-01-12 10:41:23 +08:00
wu-sheng 973718d94e Adjust dir path. 2018-01-12 10:31:24 +08:00
wu-sheng 6ce5bfd569 Make ci works with resin and ojdbc again. Try to build. 2018-01-12 10:24:21 +08:00
mck 195cc2a6a1
Merge pull request #737 from michaelsembwever/mck/manually-download-apache-incompatible-dependencies 
Remove OJDBC and resin artifacts from ci-dependencies driectory as they as not Apache license compatible
 2018-01-12 11:56:35 +11:00
Mick Semb Wever 561bbc18ab
Remove OJDBC and resin artifacts from ci-dependencies driectory as they as not Apache license compatible. 
The user can onetime manually download them, and the maven reactor will automatically build the corresponding plugins.

OJDBC is OTN which requires a user click-through agreement.
Resin is GPLv3, meaning any derivative work must also be GPLv3 licensed.
https://www.apache.org/licenses/GPL-compatibility.html

ref: https://github.com/apache/incubator-skywalking/pull/737
 2018-01-12 11:10:34 +11:00
芋道源码 b954a0b351
Merge branch 'master' into master-5.0 2018-01-11 17:48:11 -06:00
吴晟 Wu Sheng 1ed8df8024
Merge pull request #741 from apache/fix/ScheduledFuture-failsafe 
Protect the background processes.
 2018-01-12 06:03:08 +08:00
彭勇升 pengys 6c11a8404b
Merge branch 'master' into fix/ScheduledFuture-failsafe 2018-01-11 22:33:14 +08:00
吴晟 Wu Sheng 2713b5fd3b
Merge pull request #743 from ascrutae/support/postgresql-jdbc 
[Agent] Support jdbc4, jdbc3 and jdbc42 of postgresql driver
 2018-01-11 21:18:09 +08:00
YunaiV 44a5526c78 fixes #735 Concurrency conflicts in Spring plugin 
* EnhanceRequireObjectCache add clearRequestAndResponse method
* invoke EnhanceRequireObjectCache clearRequestAndResponse At AbstractMethodInterceptor
 2018-01-11 20:51:19 +08:00
peng-yongsheng 10435c2d00 Segment aggregate by h2 storage test successful. 2018-01-11 20:36:36 +08:00
peng-yongsheng a9cf2b4b12 Global trace test successful. 2018-01-11 20:22:13 +08:00
peng-yongsheng 25fb269205 Instance mapping pyramid aggregate by h2 storage test successful. 2018-01-11 20:15:37 +08:00
peng-yongsheng 3bd9e5b75d Application component pyramid aggregate by h2 storage test successful. 2018-01-11 19:39:29 +08:00
ascrutae c6e593f6f4 refactory MultiClassNameMatch code 2018-01-11 17:28:01 +08:00
YunaiV 647f4f00a7 fixes #735 Concurrency conflicts in Spring plugin ：clear ThreadLocal 2018-01-11 16:22:37 +08:00
ascrutae 97b577864f [Agent] Support jdbc4, jdbc3 and jdbc42 of postgresql driver 2018-01-11 16:08:48 +08:00
wusheng 8f49c973be Protect the background processes. 2018-01-11 15:53:40 +08:00
peng-yongsheng 98d78f21c3 Memory pool metric pyramid aggregate by h2 storage test successful. 2018-01-11 15:06:12 +08:00
peng-yongsheng 9c58e87687 Memory metric pyramid aggregate by h2 storage test successful. 2018-01-11 14:34:06 +08:00
peng-yongsheng 7d881e8ad1 no message 2018-01-11 14:14:43 +08:00
peng-yongsheng 01cd19a0ff GC metric pyramid aggregate by h2 storage test successful. 2018-01-11 14:14:23 +08:00
peng-yongsheng ccd4c8ef83 CPU metric pyramid aggregate by h2 storage test successful. 2018-01-11 13:36:06 +08:00
吴晟 Wu Sheng 3613691105
Merge pull request #739 from ascrutae/feature/support-postgresql-9.x 
[Agent] Support the version 9.4.x of postgresql jdbc driver
 2018-01-11 12:35:29 +08:00
Xin,Zhang 4223d22028
Merge branch 'master' into feature/support-postgresql-9.x 2018-01-11 11:55:17 +08:00
ascrutae b3c263fd1f [Agent] Support the version 9.4.x of postgresql jdbc driver 2018-01-11 11:36:51 +08:00
peng-yongsheng d42eb0199b Agent register test success by H2 storage. 2018-01-11 10:55:30 +08:00
YunaiV 8854921f9e fixes #735 Concurrency conflicts in Spring plugin 2018-01-11 09:48:42 +08:00
YunaiV df67393bff Merge branch 'master' of https://github.com/apache/incubator-skywalking into master-5.0 2018-01-11 08:42:28 +08:00
吴晟 Wu Sheng 6e1ac504f2
Merge pull request #736 from apache/tweeter 
Update README.md
 2018-01-10 17:31:38 +08:00
吴晟 Wu Sheng a0fba78f2a
Update README_ZH.md 2018-01-10 17:16:40 +08:00