Commit Graph

3620 Commits

Author SHA1 Message Date
吴晟 Wu Sheng d8e3bfd30b
Merge pull request #762 from ascrutae/update-docs
Update supported list
2018-01-17 10:51:36 +08:00
wu-sheng ed30481696 Add a missing field. 2018-01-17 08:20:50 +08:00
ascrutae 40909745e3 Update supported list 2018-01-16 22:26:12 +08:00
Willem Jiang 81a82f2800
Merge pull request #753 from apache/DISCLAIMER
Create DISCLAIMER
2018-01-16 21:26:01 +08:00
吴晟 Wu Sheng 7e3f41200c
Merge branch 'master' into DISCLAIMER 2018-01-16 20:54:48 +08:00
吴晟 Wu Sheng dcd746074a
Merge pull request #761 from apache/new-templete
Add new GitHub template
2018-01-16 17:25:02 +08:00
wu-sheng b4ceba6cf1 Add new GitHub template 2018-01-16 17:07:14 +08:00
吴晟 Wu Sheng dfa88e24c3
Merge pull request #760 from apache/fix/graphql-parentSpanId
Add parentSpanId for Span
2018-01-16 16:19:21 +08:00
wu-sheng b482463f42 Add parentSpanId for Span 2018-01-16 15:53:09 +08:00
Xin,Zhang 50b1d05097
Merge pull request #758 from lytscu/develop
[Agent] Provide plugins for Apache httpcomponent AsyncClient 4.1 #588
2018-01-16 15:10:39 +08:00
Xin,Zhang fcc3aa79cb
Merge branch 'master' into develop 2018-01-16 14:56:49 +08:00
吴晟 Wu Sheng 6b7a429262
Merge pull request #759 from ascrutae/mq-tags
[Agent] Add Topic and Borker tags
2018-01-16 14:39:27 +08:00
ascrutae aeb04783c6 [Agent] Add Topic and Borker tags 2018-01-16 14:15:37 +08:00
李运涛 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 b81fc9153e
Create DISCLAIMER 2018-01-14 12:18:14 +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