Commit Graph

3623 Commits

Author SHA1 Message Date
Gao Hongtao 4139918315
Merge pull request #3 from hanahmily/master
Update from origin
2018-02-28 09:44:56 +08:00
hanahmily 703933895b Add apm-webapp module 2018-02-28 09:07:05 +08:00
Gao Hongtao a393abc13d
Merge pull request #2 from apache/master
Update fork
2018-02-27 17:22:11 +08:00
吴晟 Wu Sheng 818b6b408a
Merge pull request #834 from ascrutae/feature/support-list-hystrix
add hystrix framework to support list
2018-02-27 16:23:25 +08:00
吴晟 Wu Sheng dd4626f7b3
Merge branch 'master' into feature/support-list-hystrix 2018-02-27 15:52:43 +08:00
吴晟 Wu Sheng fe587c8f29
Update Supported-list.md 2018-02-27 15:52:31 +08:00
吴晟 Wu Sheng ca9bada1a1
Merge pull request #829 from ascrutae/feature/support-hystrix-plugin
[Agent] Support hystrix plugin
2018-02-27 15:51:02 +08:00
吴晟 Wu Sheng 2b153b8bf6
Merge branch 'master' into feature/support-hystrix-plugin 2018-02-27 15:03:03 +08:00
吴晟 Wu Sheng 014fd122fb
Merge pull request #835 from ascrutae/fix/toolkit-issue
[Agent] fix intercept class package name  is incorrect
2018-02-27 15:02:46 +08:00
Xin,Zhang 2893d381a1
Merge branch 'master' into feature/support-list-hystrix 2018-02-27 14:40:07 +08:00
ascrutae 66e3eb0765 [Agent] fix some intercept package name about toolkit's class is incorrect 2018-02-27 14:37:22 +08:00
吴晟 Wu Sheng 9a401a3545
Merge branch 'master' into feature/support-hystrix-plugin 2018-02-27 14:16:17 +08:00
吴晟 Wu Sheng 7f83f42789
Merge pull request #833 from ascrutae/fix/remove-javadoc
[Agent] fix that javadoc import unused class cause classloader issue
2018-02-27 14:15:29 +08:00
ascrutae 83461aa679 fix checkstyle failed 2018-02-27 13:22:11 +08:00
ascrutae 49b4314aeb fix check style failed 2018-02-27 12:04:12 +08:00
ascrutae b090cfaf37 Move Hystrix to Spring Ecosystem 2018-02-27 11:57:49 +08:00
ascrutae a3cb3e4130 add hystrix framework to support list 2018-02-27 11:51:12 +08:00
ascrutae 64c48ea7a7 remove javadoc 2018-02-27 11:32:17 +08:00
ascrutae 0d6233dd54 [Agent] fix that javadoc import unused class cause classloader issue 2018-02-27 11:29:18 +08:00
吴晟 Wu Sheng a1711f7390
Update pom.xml 2018-02-27 08:33:59 +08:00
吴晟 Wu Sheng acae617047
Merge branch 'master' into feature/support-hystrix-plugin 2018-02-27 06:21:27 +08:00
ascrutae 107eaacfa7 Adjust hystrix plugin buried point 2018-02-27 00:23:33 +08:00
吴晟 Wu Sheng 0a5c4ec12b
Merge pull request #831 from apache/deploy-snapshot
Fix assembly and change version to SNAPSHOT
2018-02-26 23:50:30 +08:00
wusheng f7fdd9f854 Fix assmbly for mvn clean install -Papache-release and update version to SNAPSHOT for SNAPSHOT release. 2018-02-26 23:22:10 +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