ascrutae
107eaacfa7
Adjust hystrix plugin buried point
2018-02-27 00:23:33 +08:00
吴晟 Wu Sheng
851ee0fe45
Merge branch 'master' into feature/support-hystrix-plugin
2018-02-26 18:56:23 +08:00
吴晟 Wu Sheng
e72f668bfb
Merge pull request #830 from apache/fix/javadoc
...
Fix javadoc for preparing for our first ASF release.
2018-02-26 18:56:03 +08:00
wu-sheng
df328b6ea7
Try another ci command to speed up.
2018-02-26 17:43:48 +08:00
wu-sheng
5ba864d88d
Fix an oracle javadoc.
2018-02-26 16:55:50 +08:00
wu-sheng
64d0660d21
Fix optional plugin javadoc
2018-02-26 16:49:52 +08:00
wu-sheng
400ad41a64
Fix all javadoc issues.
2018-02-26 15:47:19 +08:00
wu-sheng
1d6ca31b62
Commit many java doc fixes.
2018-02-26 12:01:24 +08:00
wu-sheng
158b6ff884
Fixing javadoc. And try to trigger a ci fail in this commit, in order to make sure javadoc will be checked in further pull request.
2018-02-26 09:15:10 +08:00
ascrutae
b4d58cd19b
Adjust variable name and remove some confuse comment
2018-02-25 23:15:14 +08:00
ascrutae
65456716a3
add comment
2018-02-25 21:43:27 +08:00
ascrutae
c58c9ec412
Merge upstream/master to master
2018-02-25 21:05:08 +08:00
ascrutae
fa99652d5b
[Agent] Support hystrix plugin
2018-02-25 21:02:38 +08:00
吴晟 Wu Sheng
e8477c0fdf
Merge pull request #828 from ascrutae/feature/generic-type
...
[Agent] fix HierarchyMatch donot support generic type
2018-02-25 18:15:28 +08:00
ascrutae
8d381976cd
[Agent] fix HierarchyMatch donot support generic type
2018-02-25 17:03:24 +08:00
彭勇升 pengys
239579fda2
Merge pull request #827 from ascrutae/fix/servicecomb-1.x-plugin-compile-failure
...
[Agent] fix the servicecomb-1.x-plugin build failure in local workdir
2018-02-25 12:04:24 +08:00
ascrutae
2c493bcd66
[Agent] fix the servicecomb-1.x-plugin build failure in local workdir
2018-02-25 11:49:18 +08:00
吴晟 Wu Sheng
00f7900c6b
Merge pull request #826 from lytscu/servicecomb
...
Add [Agent] V1 servicecomb plugin
2018-02-24 18:54:17 +08:00
李运涛 liyuntao
047df44cd2
Merge branch 'master' into servicecomb
2018-02-24 02:47:02 -06:00
lytscu
dbee9531f1
Add [Agent] V1 servicecomb plugin
2018-02-24 16:16:30 +08:00
吴晟 Wu Sheng
93bf408bdc
Merge pull request #824 from apache/doc/how-to-build
...
Adjust build guide document.
2018-02-23 22:44:42 +08:00
吴晟 Wu Sheng
de383fe341
Update README_ZH.md
...
Fix format in cn
2018-02-23 22:06:31 +08:00
吴晟 Wu Sheng
f82d3394a2
Update README_ZH.md
...
Fix format
2018-02-23 22:05:22 +08:00
吴晟 Wu Sheng
8a33bf75b9
Update README_ZH.md
...
UI has already included in main repo.
2018-02-23 22:04:35 +08:00
吴晟 Wu Sheng
29fcc3d1d4
Update README.md
...
UI has already included in main repo.
2018-02-23 22:03:58 +08:00
wusheng
45d9491cc0
Adjust build guide document.
2018-02-23 21:49:21 +08:00
吴晟 Wu Sheng
98256a8c8d
Merge pull request #821 from apache/document/community-links
...
Add links to resources catalog
2018-02-23 17:22:41 +08:00
吴晟 Wu Sheng
65dc377b70
Merge branch 'master' into document/community-links
2018-02-23 17:08:46 +08:00
吴晟 Wu Sheng
0c47dac853
Merge pull request #823 from apache/proto-update
...
Update submodule.
2018-02-23 17:06:54 +08:00
wu-sheng
8a1f4434d7
Update submodule.
2018-02-23 16:51:14 +08:00
吴晟 Wu Sheng
9486fbf65b
Merge branch 'master' into document/community-links
2018-02-23 15:11:14 +08:00
吴晟 Wu Sheng
8435871081
Merge pull request #822 from apache/submodule
...
Using submodule to link protocol and UI
2018-02-23 14:29:58 +08:00
Wu Sheng
3b3a20e251
Add submodule links for protocol
2018-02-23 11:46:30 +08:00
Wu Sheng
c8b2110d5e
add UI as a submodule
2018-02-23 10:22:00 +08:00
wu-sheng
edffdf6ce4
Add links to resources catalog in https://github.com/OpenSkywalking/Community
2018-02-23 08:47:53 +08:00
吴晟 Wu Sheng
3298c383d5
Merge pull request #820 from sdanzo/master
...
Update assembly.xml
2018-02-19 08:20:24 +08:00
Danzo
c96077ebbc
Update assembly.xml
...
fixed maven 3.3.9 build issue caused by empty assembly ID on Ubuntu 16.04.2 using OpenJDK 1.8.0_151.
[INFO] Building apm-collector-boot 5.0.0-alpha
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ apm-collector-boot ---
[INFO] Deleting /home/steve/skywalking/incubator-skywalking/apm-collector/apm-collector-boot/target
[INFO]
[INFO] --- maven-checkstyle-plugin:2.17:check (validate) @ apm-collector-boot ---
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 1.492 s
[INFO] Finished at: 2018-02-18T12:05:49-06:00
[INFO] Final Memory: 19M/235M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-checkstyle-plugin:2.17:check (validate) on project apm-collector-boot: Failed during checkstyle configuration: cannot initialize module Header - Unable to find: CHECKSTYLE_HEAD -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException
2018-02-18 12:22:56 -06:00
Gao Hongtao
787f26244b
Merge pull request #819 from peng-yongsheng/feature/graphql_protocol
...
Change the data type of sla and apdex attributes from Float to Int.
2018-02-14 09:29:07 +08:00
吴晟 Wu Sheng
47e29900f6
Merge branch 'master' into feature/graphql_protocol
2018-02-14 06:17:16 +08:00
peng-yongsheng
4836883d75
Change the data type of sla and apdex attributes from Float to Int.
2018-02-13 23:52:00 +08:00
吴晟 Wu Sheng
d42458ffd8
Merge pull request #815 from apache/update/logbck-version
...
Update logback version in application logback toolkit
2018-02-13 23:24:52 +08:00
吴晟 Wu Sheng
efcc8e856c
Merge branch 'master' into update/logbck-version
2018-02-13 23:09:09 +08:00
吴晟 Wu Sheng
ab3615e237
Merge pull request #818 from peng-yongsheng/feature/metric_check
...
Agent data aggregate test.
2018-02-13 23:08:25 +08:00
peng-yongsheng
37a5287360
JVM metric aggregate tested.
2018-02-13 22:52:12 +08:00
peng-yongsheng
1435cbb1fe
Trace segment metric aggregate and alarm metric aggregate tested.
2018-02-13 18:00:19 +08:00
彭勇升 pengys
2cef97a897
Merge pull request #817 from peng-yongsheng/feature/heartbeat_test
...
Instance heart beat tested with elastic search.
2018-02-13 16:27:23 +08:00
peng-yongsheng
a14207e67a
Instance heart beat tested with elastic search. OK.
2018-02-13 16:12:19 +08:00
peng-yongsheng
ede4260f3f
Merge branch 'master' into feature/heartbeat_test
2018-02-13 15:44:29 +08:00
peng-yongsheng
add26b8e96
Sleeping when id not get.
2018-02-13 15:43:40 +08:00
吴晟 Wu Sheng
abb3515963
Merge pull request #816 from peng-yongsheng/feature/register_test
...
Application, Instance, Service register tested with elastic search.
2018-02-13 15:24:36 +08:00