kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,107 Commits 1 Branch 0 Tags 166 MiB
Commit Graph

3107 Commits

Author SHA1 Message Date
zhangxin 86f22f7e83 fix the image name of collector issue and push docker images when skywalking is tagged and the branch is master 2017-04-25 13:48:12 +08:00
pengys5 91ab61b9fe Remove system out in test case 2017-04-25 12:22:34 +08:00
pengys5 67cb71e09e fixed pull request suggestion 2017-04-25 11:11:06 +08:00
zhangxin be901d52fe Push the collector docker image when sky-walking is tagged 2017-04-24 23:58:15 +08:00
pengys5 eea42183a6 style check 2017-04-24 22:27:38 +08:00
pengys5 72ed8b22e4 Fix 159 2017-04-24 21:44:15 +08:00
zhangxin c10c0c29a6 Merge branch 'zhangxin/feature/162' of https://github.com/ascrutae/sky-walking into zhangxin/feature/162 2017-04-24 17:55:39 +08:00
zhangxin e4994f0f4e Push collector docker image when sky-walking released 2017-04-24 17:54:46 +08:00
zhangxin 38b9256340 modify deploy to push 2017-04-24 17:53:44 +08:00
zhangxin 6d9df9ef2c fix #123 2017-04-24 17:29:09 +08:00
吴晟 Wu Sheng c172f34c0b Merge pull request #158 from wu-sheng/fix/140 
fix #140 ,add log bridge from slf4j to log4j that could see logs from http sever start.
 2017-04-21 17:18:21 +08:00
wusheng 0a4ac940e4 As collector is using jdk8, no need of long list “if…else”. Remove some “e.printstaktrace”. 2017-04-21 14:21:25 +08:00
吴晟 Wu Sheng 2e6d258948 Merge pull request #157 from wu-sheng/feature/141 
fix issues #141, use gson stream to deserialize http posed segments json array
 2017-04-21 14:02:18 +08:00
pengys5 3172b043d2 delete a unused import 2017-04-21 13:47:08 +08:00
pengys5 f52ca8f5a3 no message 2017-04-21 13:38:01 +08:00
pengys5 ce1add2628 fix issues #141, use gson stream to deserialize http posed segments json array 2017-04-21 13:37:26 +08:00
pengys5 4bcfc39cdd fix 2017-04-21 10:02:46 +08:00
wusheng be336477a3 Merge branch 'master' into feature/3.0.1 
* master:
  Update README.md
  modify code style
  modify code style
  modify test case
  modify mongodb
  modify MongoDBMethodInterceptorTest
  Add a flag to determine whether to bind data
  fix bugs
  Support plugin for MongoDB
 2017-04-21 09:54:18 +08:00
吴晟 Wu Sheng fd02bbe754 Merge pull request #154 from bai-yang/patch-1 
Update README.md
 2017-04-20 21:23:35 +08:00
柏杨 Bai Yang 7db8ac7803 Update README.md 2017-04-20 20:36:46 +08:00
吴晟 Wu Sheng 3b30935eb2 Merge pull request #148 from bai-yang/master 
Support plugin for MongoDB
 2017-04-20 20:23:10 +08:00
baiyang 78c330a804 modify code style 2017-04-20 18:04:44 +08:00
baiyang dd6e47552b modify code style 2017-04-20 17:52:39 +08:00
baiyang d016f31b46 modify test case 2017-04-20 16:25:40 +08:00
baiyang 4101ca022d Merge remote-tracking branch 'upstream/master' 2017-04-20 15:20:25 +08:00
baiyang 79f51a7a28 modify mongodb 2017-04-20 15:20:09 +08:00
wusheng d2adb9e858 Fix style-check failure. 2017-04-20 13:03:50 +08:00
wusheng 7ecbb8677f Merge branch 'master' into feature/3.0.1 
* master:
  fix collector cannot start issue
  Fix ci-fail.
  Add “checkStyle.xml” and “codeStyle.xml” files, varify the code-style when “mvn compile” and CI. This is the initialized commit.
  Update LICENSE
  Update LICENSE

# Conflicts:
#	skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java
 2017-04-20 13:00:58 +08:00
吴晟 Wu Sheng f62110d4c4 Merge pull request #151 from wu-sheng/feature/149 
Response for "Add checkstyle", close #149
 2017-04-20 12:54:01 +08:00
吴晟 Wu Sheng 6672d5cc04 Merge pull request #152 from ascrutae/zhangxin/fix-149 
fix collector cannot start issue
 2017-04-20 03:49:50 +08:00
zhangxin e068f183fc fix collector cannot start issue 2017-04-19 22:38:38 +08:00
baiyang 4d9e1d201a modify MongoDBMethodInterceptorTest 2017-04-19 20:56:11 +08:00
baiyang e42bf6e014 Add a flag to determine whether to bind data 2017-04-19 20:22:32 +08:00
baiyang e8084e548d fix bugs 2017-04-19 17:06:05 +08:00
wusheng 87e4647706 Fix ci-fail. 2017-04-18 13:19:57 +08:00
wusheng 17d983ba9d Add “checkStyle.xml” and “codeStyle.xml” files, varify the code-style when “mvn compile” and CI. This is the initialized commit. 2017-04-18 12:02:21 +08:00
吴晟 Wu Sheng 5c140118cf Update LICENSE 2017-04-17 23:06:42 +08:00
baiyang 085f9b69fd Support plugin for MongoDB 2017-04-17 22:04:22 +08:00
wusheng 99acbea1ba Adjust comments of “collector.config” 2017-04-17 16:15:13 +08:00
吴晟 Wu Sheng bd465ad97e Update LICENSE 2017-04-16 19:38:30 +08:00
wusheng ee1ab563c5 Adjust type of activeSpanStack, now , it is a LinkedList. 2017-04-14 16:56:20 +08:00
wusheng 57f7b7a6ac Set version = 3.0.1. 2017-04-13 21:19:07 +08:00
wusheng 38a7beae8d Update version for next iteration. 2017-04-13 17:33:45 +08:00
wusheng c257017c95 Update color again…… 2017-04-13 16:18:46 +08:00
wusheng 4e90e34438 Update badge color. 2017-04-13 16:17:23 +08:00
wusheng 26c44c9153 Adjust abstract. 2017-04-13 13:47:49 +08:00
wusheng 5859b4b233 no message 2017-04-13 11:59:06 +08:00
wusheng bcfda125f1 Prepare to release 3.0, update readme, add doc-zh link. 2017-04-13 11:21:55 +08:00
吴晟 Wu Sheng 438949de3c Merge pull request #137 from ascrutae/zhangxin/enum-not-found 
fix start error issue
 2017-04-13 10:20:13 +08:00
zhangxin 45bfd06b9b fix start error issue 2017-04-13 09:49:01 +08:00