Commit Graph

2364 Commits

Author SHA1 Message Date
wusheng cc2163b7c2 Fix compile issues. 2017-09-19 23:36:29 +08:00
wusheng 3e2e294d8a Fix some compile issue. (not finished.) 2017-09-19 19:40:44 +08:00
wusheng e0d50533c4 New context carrier. 2017-09-18 23:12:42 +08:00
wusheng cd1d3a3bcc Fix compile issue. 2017-09-18 21:57:33 +08:00
wusheng 9f4bcf7e3e Optimise ID encoding. Only do once for every ID object. 2017-09-18 21:56:53 +08:00
wusheng 1030ec3a70 Update README 2017-09-17 08:15:28 +08:00
wusheng 099877c2ce Prepare for 3.2 iteration. 2017-09-17 07:54:25 +08:00
吴晟 Wu Sheng 065994a569 Merge pull request #432 from wu-sheng/pengys5-patch-2
Update README_ZH.md
2017-09-16 23:02:36 +08:00
吴晟 Wu Sheng 38ba7f8403 Merge pull request #431 from wu-sheng/pengys5-patch-1
Update README.md
2017-09-16 23:02:11 +08:00
彭勇升 Buddha c2f7aeb27c Update README_ZH.md 2017-09-16 23:01:06 +08:00
彭勇升 Buddha 83ffdee89f Update README.md 2017-09-16 23:00:28 +08:00
吴晟 Wu Sheng df553f6e60 Merge pull request #429 from ascrutae/zhangxin/feature/collector-image
support collector image
2017-09-16 19:19:28 +08:00
吴晟 Wu Sheng c95ac03a33 Merge pull request #430 from wu-sheng/fix/cluster
Add the implementation of deserialize and serialize method in data de…
2017-09-16 19:10:41 +08:00
pengys5 ec03cc5cae Instance sort 2017-09-16 17:47:26 +08:00
pengys5 dbdd083800 Add the implementation of deserialize and serialize method in data define class. 2017-09-16 17:34:04 +08:00
ascrutae d50a9f2c29 support collector image 2017-09-16 17:25:55 +08:00
吴晟 Wu Sheng dae5c6921a Merge pull request #428 from wu-sheng/fix/419
Fix/419 make agent jvm, agent register as agent stream sub maven module.
2017-09-16 13:51:12 +08:00
pengys5 f4d193990e #419 add configuration in application.yml file, e.g. elastic search index shard number, index replicas number. 2017-09-16 13:32:26 +08:00
pengys5 ca684bf84f no message 2017-09-16 12:44:48 +08:00
pengys5 63efb6f583 Merge branch 'fix/417' into fix/419 2017-09-16 12:44:02 +08:00
pengys5 db909028ad Merge branch 'fix/418' into fix/419 2017-09-16 12:43:55 +08:00
pengys5 e91e69f1f8 Fixed #419, make agent jam, agent register as agent stream sub maven module. 2017-09-16 00:27:37 +08:00
pengys5 9987f5f7aa Fixed #418, move the operation which create instances json array outside of for each function. 2017-09-15 23:27:46 +08:00
pengys5 204177b868 Fixed #417, sort service as tree 2017-09-15 23:21:28 +08:00
吴晟 Wu Sheng e2e991d83d Update README_ZH.md 2017-09-15 14:12:55 +08:00
吴晟 Wu Sheng 88b6cd2f7c Update README.md 2017-09-15 14:12:21 +08:00
吴晟 Wu Sheng d825c0cec0 Update GRPCChannelManager.java
Fix wrong log class name.
2017-09-14 10:53:32 +08:00
吴晟 Wu Sheng f27effee70 Merge pull request #414 from ascrutae/zhangxin/fix/log-path
change log component.
2017-09-14 06:48:54 +08:00
吴晟 Wu Sheng 1535fc5b65 Merge pull request #415 from wu-sheng/feature/aggbug
Fixed the bug that application calls sum incorrect.
2017-09-14 06:46:21 +08:00
pengys5 ac5673f955 Fixed the bug that application calls sum incorrect. Because of merge method return a non merged value . 2017-09-14 00:13:40 +08:00
ascrutae f9e7298a7d change log component. 2017-09-13 23:59:43 +08:00
吴晟 Wu Sheng db57d8de29 Update ContextCarrier.java 2017-09-13 16:00:35 +08:00
wusheng 3f188b1454 Update read for readme. 2017-09-11 12:35:46 +08:00
吴晟 Wu Sheng 83cb797b35 Merge pull request #412 from wu-sheng/feature/servicetree
service tree merge error
2017-09-11 11:29:10 +08:00
pengys5 91c03289f6 service tree merge error 2017-09-11 11:05:33 +08:00
wusheng e84f95ac26 Update readme. 2017-09-11 00:48:45 +08:00
吴晟 Wu Sheng 8ca710f5b6 Merge pull request #411 from wu-sheng/feature/servicetree
Property name error
2017-09-11 00:32:09 +08:00
pengys5 122ff6d4c4 Property name error 2017-09-11 00:25:56 +08:00
吴晟 Wu Sheng 572af04393 Merge pull request #410 from wu-sheng/feature/shellerror
no message
2017-09-10 23:47:16 +08:00
pengys5 ce02f45216 no message 2017-09-10 23:32:40 +08:00
吴晟 Wu Sheng 1cde27fa74 Merge pull request #409 from wu-sheng/feature/cluster
Feature/cluster
2017-09-10 22:34:46 +08:00
pengys5 87754831ae Fixed check style error 2017-09-10 22:22:52 +08:00
pengys5 51d96d36ee Fixed style check error 2017-09-10 22:08:31 +08:00
pengys5 9371716838 fixed data merge error 2017-09-10 21:56:59 +08:00
pengys5 75bed4998d Merge branch 'master' into feature/cluster 2017-09-10 21:12:29 +08:00
pengys5 d45e7fec67 no message 2017-09-10 21:11:54 +08:00
pengys5 897cd24252 no message 2017-09-10 18:54:35 +08:00
吴晟 Wu Sheng dc95c0327c Merge pull request #408 from ascrutae/zhangxin/feature/skywalking-package
fix package issue
2017-09-10 16:37:00 +08:00
ascrutae 88c89e500a fix package issue 2017-09-10 16:21:05 +08:00
pengys5 3773c46811 Merge branch 'master' into feature/cluster 2017-09-10 14:15:59 +08:00