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

3356 Commits

Author SHA1 Message Date
李运涛 liyuntao bcac37b534
Merge branch 'master' into develop 2018-01-16 11:02:20 +08:00
吴晟 Wu Sheng ba9c5af101
Merge pull request #757 from peng-yongsheng/feature/graphql 
Lowercase the IPv4 and IPv6 attributes.
 2018-01-16 09:39:38 +08:00
吴晟 Wu Sheng 4f2c781270
Merge branch 'master' into feature/graphql 2018-01-16 09:26:04 +08:00
peng-yongsheng b525e1e0e2 Lowercase the IPv4 and IPv6 attributes, because of there have a java style check that regulate the first letter must be lowercase. 2018-01-16 09:18:56 +08:00
lytscu 4a0a210348 Modify ComponentsDefine.java 2018-01-15 19:19:49 +08:00
lytscu f58ecdb929 Merge remote-tracking branch 'upstream/master' into develop 
y
 2018-01-15 15:05:05 +08:00
lytscu c8ca51a547 [Agent] Provide plugins for Apache httpcomponent AsyncClient 4.1 #588 2018-01-15 15:00:32 +08:00
吴晟 Wu Sheng ab38da59f7
Merge pull request #732 from apache/fix/graphql/node-nullable 
Adjust ui-query protocol
 2018-01-15 11:15:00 +08:00
吴晟 Wu Sheng 315a6f06d9
Merge branch 'master' into fix/graphql/node-nullable 2018-01-15 10:51:46 +08:00
吴晟 Wu Sheng 3f59c059fb
Merge pull request #756 from apache/document/star-twitter 
Document/star twitter
 2018-01-15 10:17:57 +08:00
wu-sheng bcffa44ad4 Update badges. 2018-01-15 09:59:09 +08:00
wu-sheng 7a8afc5bc0 Change layout. 2018-01-15 09:33:50 +08:00
wu-sheng c5bedc51dd New badges about github stars and twitter followers. 2018-01-15 09:31:12 +08:00
Xin,Zhang b8d66bde59
Merge pull request #755 from peng-yongsheng/fixed/storage_bug 
Missing change about boolean to integer.
 2018-01-14 18:12:18 +08:00
Xin,Zhang 05efadcd64
Merge branch 'master' into fixed/storage_bug 2018-01-14 17:57:08 +08:00
Xin,Zhang fa9f7e489e
Merge pull request #754 from peng-yongsheng/fixed/id_increment_bug 
Fixed the id auto increment bug
 2018-01-14 17:56:48 +08:00
Xin,Zhang bd32554284
Merge branch 'master' into fixed/storage_bug 2018-01-14 17:45:53 +08:00
Xin,Zhang adceb77f22
Merge branch 'master' into fixed/id_increment_bug 2018-01-14 17:45:23 +08:00
peng-yongsheng b04b06aac1 Fixed the id auto increment bug, when there is just one record that id = -1, the expected value is 1, but actual return -1. 2018-01-14 17:40:15 +08:00
peng-yongsheng fc431d3c9a Missing change about boolean to integer. 2018-01-14 17:05:45 +08:00
吴晟 Wu Sheng d937cfa485
Merge pull request #751 from apache/update-year 
Update NOTICE.txt
 2018-01-14 10:28:18 +08:00
吴晟 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
wusheng 691fb78bc9 Add `isAlarm` for ApplicationNode. 2018-01-13 22:38:25 +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 ca224832b2
Merge branch 'master' into fix/graphql/node-nullable 2018-01-13 07:32:05 +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
wusheng 8f260f8eb1 Update trace type. 2018-01-12 23:28:21 +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 41d7b5cb54 Add a query service 2018-01-12 14:14:12 +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
wu-sheng 225903a92a Fix missing parts. 2018-01-12 09:48:49 +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