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

1878 Commits

Author SHA1 Message Date
吴晟 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
zhangxin 29c72d2595 fix the image name of collector issue and push docker images when skywalking is tagged and the branch is master 2017-04-25 14:18:24 +08:00
zhangxin 0fe22b3b84 add docker service 2017-04-25 14:17:48 +08:00
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