Commit Graph

1759 Commits

Author SHA1 Message Date
ascrutae c5f4f82bd0 fix functional issues after update new package name 2017-04-28 15:42:09 +08:00
pengys5 e3524d8555 1. When batch replace the package of plugin def class was lost.
2. Some class check style error.
2017-04-28 02:46:11 +08:00
pengys5 b2b36fee00 Change groupId and artifactId 2017-04-28 01:17:09 +08:00
吴晟 Wu Sheng 4da209a24a Merge pull request #175 from xcaspar/feature/174
chore(project): add the .gitignore file to project
2017-04-27 18:21:50 +08:00
wusheng cdb6460a3e Update version to 3.1 for next iteration. 2017-04-27 18:09:02 +08:00
吴晟 Wu Sheng 30b7950310 Merge pull request #178 from ascrutae/zhangxin/fix/150
Redis plugin cannot work on tomcat
2017-04-27 17:10:13 +08:00
ascrutae 73401d1077 fix ci failed issue 2017-04-27 16:58:24 +08:00
ascrutae 24010d134b fix issue that test compile failed 2017-04-27 16:28:45 +08:00
ascrutae 4dd76f06b5 Fix redis plugin don't work issue 2017-04-27 15:49:26 +08:00
吴晟 Wu Sheng d8c9035283 Merge pull request #173 from wu-sheng/feature/3.0.1
Prepare for release 3.0.1
2017-04-27 09:59:14 +08:00
wusheng a196fa069a Merge branch 'feature/159' into feature/3.0.1
* feature/159:
  no message
  no message
  no message
  no message
  no message
  no message
  no message
  Add log4j.xml into test package
2017-04-27 09:46:40 +08:00
吴晟 Wu Sheng 7beda22aca Merge pull request #177 from ascrutae/zhangxin/fix/176
modify the expose port of collector image
2017-04-27 09:37:51 +08:00
ascrutae 150dd71333 modify the expose port of collector image 2017-04-27 09:18:20 +08:00
xcaspar 73fea13e9e chore(project): add the .gitignore file to project 2017-04-27 09:01:54 +08:00
pengys5 717bc584d2 no message 2017-04-27 02:18:09 +08:00
pengys5 c72e1c4f33 no message 2017-04-27 02:14:12 +08:00
pengys5 1c3423a4c0 no message 2017-04-26 23:51:43 +08:00
pengys5 7ee7d8e0d6 no message 2017-04-26 23:45:56 +08:00
pengys5 1f960e4503 no message 2017-04-26 23:09:59 +08:00
pengys5 91a0c2d337 no message 2017-04-26 22:47:28 +08:00
pengys5 3f1766373f no message 2017-04-26 22:36:58 +08:00
pengys5 662c8e6184 Add log4j.xml into test package 2017-04-26 22:28:20 +08:00
吴晟 Wu Sheng 3abbc671fc Merge pull request #172 from ascrutae/zhangxin/fix/169
The opentracing-toolkit context can not propagation across process
2017-04-26 17:32:35 +08:00
zhangxin 3dfbb6abef modify Java doc 2017-04-26 17:22:32 +08:00
zhangxin 784bda40f0 modify Java doc to improve readable 2017-04-26 17:18:24 +08:00
zhangxin 11a4d14d6d fix style check failed issue 2017-04-26 15:54:11 +08:00
zhangxin 42c9ebd046 Merge branch 'feature/3.0.1' into zhangxin/fix/169 2017-04-26 15:39:15 +08:00
吴晟 Wu Sheng e577b791ef Merge pull request #165 from wu-sheng/feature/159
Fix a bug and improve performance
2017-04-26 15:31:20 +08:00
zhangxin a16f6f657e refactory method name 2017-04-26 15:26:47 +08:00
pengys5 d4eed42ab8 no message 2017-04-26 15:13:46 +08:00
pengys5 70fedb10fc Rename data entity 2017-04-26 15:13:21 +08:00
吴晟 Wu Sheng ba068e81e1 Merge pull request #163 from ascrutae/zhangxin/feature/162
Push the collector docker image when sky-walking is tagged
2017-04-26 14:47:10 +08:00
zhangxin 3b2b4d786a modify the properties key of docker configuration for increase readability 2017-04-26 14:32:29 +08:00
zhangxin 0544edabf7 fix issue that skywalking extract binary data failed and refectory code 2017-04-26 14:08:19 +08:00
pengys5 c43d375d81 no message 2017-04-26 13:50:01 +08:00
pengys5 e77abe23a6 no message 2017-04-26 12:08:49 +08:00
pengys5 6233b69e57 no message 2017-04-26 11:49:47 +08:00
wusheng 7e80c6af37 Update docker-compose for next release. 2017-04-26 11:43:17 +08:00
pengys5 c5eb330c1c testcase 2017-04-26 11:40:26 +08:00
pengys5 15684ea934 segment entity testcase 2017-04-26 10:28:36 +08:00
pengys5 d772b95ce5 Unrest 2017-04-26 01:10:53 +08:00
pengys5 9394c9f319 style check error 2017-04-26 01:04:43 +08:00
pengys5 83a5896d3b Unrest 2017-04-26 00:59:54 +08:00
pengys5 700c772298 mock 2017-04-26 00:54:01 +08:00
zhangxin c762b2333c Push the collector docker image when sky-walking is tagged 2017-04-25 23:39:49 +08:00
wusheng 737e6a57a9 no message 2017-04-25 16:08:09 +08:00
wusheng 2f0a947169 If the tag value is short, process it as an integer. It is a bug for ot+agent. 2017-04-25 16:07:11 +08:00
zhangxin 84a39020bb Merge branch 'zhangxin/feature/162' of https://github.com/ascrutae/sky-walking into zhangxin/feature/162 2017-04-25 14:20:35 +08:00
zhangxin 5c40e46228 fix the image name of collector issue and push docker images when skywalking is tagged and the branch is master 2017-04-25 14:20:14 +08:00
zhangxin f3100e09e1 Merge branch 'zhangxin/feature/162' of https://github.com/ascrutae/sky-walking into zhangxin/feature/162 2017-04-25 14:19:04 +08:00