Commit Graph

24 Commits

Author SHA1 Message Date
gaohongtao 318c3db7c9 Update version to 5.0.0-alpha with `mvn versions:set -DnewVersion=5.0.0-alpha` 2017-12-15 10:40:23 +08:00
wusheng b16d23c148 Update artifactId to "org.apache.skywalking" 2017-12-10 08:21:20 +08:00
wusheng 23133f7d97 Update copyright to Apache Foundation. 2017-12-09 23:38:32 +08:00
peng-yongsheng a9ff0b2812 Merge branch 'master' into feature/alerting
# Conflicts:
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentAggregationWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentRemoteWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingAggregationWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingRemoteWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricPersistenceWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricRemoteWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/instance/InstanceMetricPersistenceWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferenceAggregationWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceMetricPersistenceWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceMetricRemoteWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricAggregationWorker.java
#	apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceReferenceMetricPersistenceWorker.java
#	apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/skywalking/apm/collector/alerting/worker/AlertingListPersistenceWorker.java
2017-12-09 23:16:11 +08:00
wusheng d458622bb4 Update version to 5.0-2018-preview for new iteration. 2017-12-06 22:06:54 +08:00
wusheng 055c760bc0 Set versions, and documents ready for releasing 3.2.6 2017-12-04 22:04:28 +08:00
wusheng 8bc03bddb9 Merge branch 'fix/gRPC-1.8.0'
* fix/gRPC-1.8.0:
  Update netty to 4.1.17
  Update gRPC version. And shade google opencensus in agent.
2017-12-04 21:11:25 +08:00
peng-yongsheng 4b78b86067 Merge branch 'fix/gRPC-1.8.0' into feature/alerting 2017-12-03 10:11:50 +08:00
peng-yongsheng 31b872b226 upgrade the version of grpc proto generator of maven plugin to 1.8.0 2017-12-03 09:52:19 +08:00
peng-yongsheng 83aa2ce2bf Merge branch 'fix/gRPC-1.8.0' into feature/alerting 2017-12-03 09:45:28 +08:00
wusheng 0b6f430f29 Update netty to 4.1.17 2017-12-01 22:54:04 +08:00
wusheng 994d11c501 Update gRPC version. And shade google opencensus in agent. 2017-12-01 22:37:34 +08:00
peng-yongsheng b322b55af6 Upgrade the version from 3.2.5 to 3.3.0. 2017-11-22 15:12:00 +08:00
peng-yongsheng eaa0254512 Test success with standalone and cluster mode. 2017-11-19 22:25:11 +08:00
wu-sheng f601293b22 Update the version to 3.2.5 2017-11-16 12:14:26 +08:00
wusheng 4bdea9e2c9 Update version for 3.2.4 release. 2017-11-06 22:45:00 +08:00
peng-yongsheng 52f1420670 Add copyright head in all java files and copyright head check style 2017-10-10 22:27:57 +08:00
wusheng b16963a4bf Change version for next iteration. 2017-09-29 17:18:14 +08:00
peng-yongsheng 0d13b27362 Version change 2017-09-28 10:54:16 +08:00
wusheng 099877c2ce Prepare for 3.2 iteration. 2017-09-17 07:54:25 +08:00
ascrutae 8a2876aad0 upgrade netty version and fix miss dependency classes issue 2017-07-01 00:18:50 +08:00
ascrutae a139862c79 Revert "Add logic of shade grpc package"
This reverts commit c52686f894.
2017-06-23 17:08:53 +08:00
ascrutae c52686f894 Add logic of shade grpc package 2017-06-23 16:54:14 +08:00
wusheng c31fa270d1 Initialize some config for grpc. 2017-06-22 20:55:16 +08:00