Commit Graph

2907 Commits

Author SHA1 Message Date
peng-yongsheng f930436067 no message 2017-11-22 15:30:14 +08:00
peng-yongsheng 94a94c6bf1 Fixed a mistake. 2017-11-22 15:28:33 +08:00
peng-yongsheng b322b55af6 Upgrade the version from 3.2.5 to 3.3.0. 2017-11-22 15:12:00 +08:00
wusheng baf4000417 Fix port. 2017-11-21 21:48:58 +08:00
吴晟 Wu Sheng 6af1644697
Merge pull request #610 from ascrutae/feature/support-docker-image
support collector docker images
2017-11-21 21:43:09 +08:00
ascrutae 4c1c70b6a9 support collector docker images 2017-11-21 21:38:45 +08:00
wusheng 33bc0a19ac Add badges for version. 2017-11-21 21:02:36 +08:00
彭勇升 Buddha b4b9835a89
Merge pull request #611 from OpenSkywalking/feature/reset-ports
Reset ports.
2017-11-21 16:03:28 +08:00
wu-sheng 80b5851779 Reset ports. 2017-11-21 15:33:03 +08:00
吴晟 Wu Sheng 092d9ceaa8
Merge pull request #609 from lytscu/develop
Modify Readme Supported-list.md:MongoDB Java Driver  2.13-2.14,3.4+
2017-11-21 11:08:58 +08:00
lytscu 27f4531d10 Modify:MongoDB Java Driver 2.13-2.14,3.3+ 2017-11-21 10:52:17 +08:00
吴晟 Wu Sheng 513ae0136c
Merge pull request #606 from OpenSkywalking/feature/582
Add TIME column for table segment data
2017-11-21 09:41:38 +08:00
peng-yongsheng 6e642dfd83 Merge branch 'feature/582' of https://github.com/OpenSkywalking/skywalking into feature/582 2017-11-21 09:11:47 +08:00
peng-yongsheng 4d415a8aee Add the time bucket setting in segment DAO class. 2017-11-21 09:11:27 +08:00
liyuntao bf37c77ade [MongoDB Java Driver](https://github.com/mongodb/mongo-java-driver) 2.13-2.14,3.4+ 2017-11-20 23:48:09 +08:00
吴晟 Wu Sheng 59630799d9
Merge pull request #607 from ascrutae/feature/support-mysql-5.x-plugin
support mysql-5.0.5 driver
2017-11-20 19:35:32 +08:00
吴晟 Wu Sheng ee44d7a62a
Merge branch 'master' into feature/support-mysql-5.x-plugin 2017-11-20 18:57:08 +08:00
吴晟 Wu Sheng 8fe052dbe7
Merge pull request #599 from ascrutae/feature/support-start-script
support start script of  the collector
2017-11-20 18:50:23 +08:00
Xin,Zhang 584e9b8dfd
Merge branch 'master' into feature/582 2017-11-20 18:06:17 +08:00
liyuntao 835ebbcb1c
Merge pull request #579 from lytscu/develop
Add  MongoDB Java Driver 2.13.x-2.14.x enhance plugin
2017-11-20 03:40:39 -06:00
lytscu 8c2758ba69 Merge branch 'develop' of https://github.com/lytscu/skywalking into develop
y
2017-11-20 17:22:03 +08:00
lytscu 242ce80096 Remove tag: activeSpan.tag(CommandError, cresult.getErrorMessage()); 2017-11-20 17:21:13 +08:00
彭勇升 Buddha f4b1d1a272
Merge branch 'master' into feature/582 2017-11-20 16:50:48 +08:00
ascrutae e9c300bb4f support mysql-5.0.5 driver 2017-11-20 15:56:17 +08:00
liyuntao 1b2c8f75a0
Merge branch 'master' into develop 2017-11-20 14:09:17 +08:00
吴晟 Wu Sheng 4152fa2cb2
Merge branch 'master' into feature/support-start-script 2017-11-20 13:44:15 +08:00
吴晟 Wu Sheng 33755f7a80
Merge pull request #605 from ascrutae/fix/naming-service-url-issue
fix the naming service url and port is incorrect issue
2017-11-20 13:41:07 +08:00
peng-yongsheng 90bd26c89e Add TIME column for table segment data
#582
2017-11-20 13:30:59 +08:00
ascrutae 9a4d4a21b8 fix the naming service url and port is incorrect 2017-11-20 13:04:12 +08:00
lytscu 626ef11fef comments 2017-11-20 11:20:24 +08:00
liyuntao f1be3e9934
Merge branch 'master' into develop 2017-11-20 09:42:57 +08:00
吴晟 Wu Sheng 461672c954
Merge branch 'master' into feature/support-start-script 2017-11-19 23:08:30 +08:00
吴晟 Wu Sheng af0b05a508
Merge pull request #600 from OpenSkywalking/feature/split-agent-module
Feature/split agent module
2017-11-19 23:08:04 +08:00
peng-yongsheng 0804bc3f18 Merge branch 'feature/split-agent-module' of https://github.com/OpenSkywalking/skywalking into feature/split-agent-module 2017-11-19 22:52:22 +08:00
peng-yongsheng 14967e4949 Fixed maven package error from style check. 2017-11-19 22:44:33 +08:00
吴晟 Wu Sheng c85db8c4f9
Merge branch 'master' into feature/split-agent-module 2017-11-19 22:42:56 +08:00
peng-yongsheng eaa0254512 Test success with standalone and cluster mode. 2017-11-19 22:25:11 +08:00
吴晟 Wu Sheng 1996e6ed6f
Merge pull request #598 from ascrutae/fix/restemplate-plugin-issue
fix issue restemplate plugin don’t works fine
2017-11-19 22:21:03 +08:00
吴晟 Wu Sheng dcb8512225
Merge branch 'master' into fix/restemplate-plugin-issue 2017-11-19 21:13:26 +08:00
ascrutae 750e57fc8e fix issue restemplate plugin don’t works fine 2017-11-19 17:09:23 +08:00
吴晟 Wu Sheng ee2f5c5e25
Merge pull request #595 from ascrutae/fix/spring-aop-issue
fix issue that controller cannot find the request mapping
2017-11-19 01:30:40 -06:00
吴晟 Wu Sheng 1c762f1c21
Merge branch 'master' into fix/spring-aop-issue 2017-11-19 01:08:12 -06:00
ascrutae b13049a429 support start script 2017-11-19 08:54:51 +08:00
wusheng d2df4db284 Adjust the find server codes. 2017-11-18 10:32:25 +08:00
ascrutae 61c7a35bee fix issue that controller cannot find the request mapping 2017-11-18 10:23:39 +08:00
peng-yongsheng f3e85ef6e3 Change apm-collector-stream from collector module to common codes.
Make agent gRPC to be a collector module.
Make agent jetty to be a collector module.
Make agent stream to be a collector module.
2017-11-17 13:57:20 +08:00
lytscu 57ee51f256 comments 2017-11-16 21:26:39 +08:00
吴晟 Wu Sheng 8658ca7752
Merge pull request #592 from OpenSkywalking/feature/stream-jetty
Feature/stream jetty
2017-11-16 07:23:56 -06:00
lytscu 14bc3d9670 comments 2017-11-16 21:14:50 +08:00
吴晟 Wu Sheng df97dc3428
Merge branch 'master' into feature/stream-jetty 2017-11-16 07:06:58 -06:00