This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from f99294d Update startup.sh
add 87449d0 Add IDColumn Annotation. (#1667)
add 5627f72 Merge branch 'master' into wu-sheng-patch-1
No new revisions were added by this update.
Summary of changes:
.../analysis/generated/endpoint/EndpointAvgIndicator.java | 6 +++---
.../generated/endpoint/EndpointPercentIndicator.java | 6 +++---
.../endpointrelation/EndpointRelationAvgIndicator.java | 12 ++++++------
.../core/analysis/generated/service/ServiceAvgIndicator.java | 2 +-
.../analysis/generated/service/ServiceCallsSumIndicator.java | 2 +-
.../serviceinstance/ServiceInstanceRespTimeIndicator.java | 4 ++--
.../serviceinstancejvmcpu/InstanceJvmCpuIndicator.java | 4 ++--
.../InstanceJvmYoungGcTimeIndicator.java | 4 ++--
.../InstanceJvmMemoryMaxIndicator.java | 4 ++--
.../InstanceJvmMemoryPoolMaxIndicator.java | 4 ++--
.../ServiceInstanceRelationAvgIndicator.java | 8 ++++----
.../servicerelation/ServiceRelationAvgIndicator.java | 4 ++--
.../ServiceRelationClientCallsSumIndicator.java | 4 ++--
.../ServiceRelationServerCallsSumIndicator.java | 4 ++--
.../annotation/Arg.java => storage/annotation/IDColumn.java} | 8 +++++---
15 files changed, 39 insertions(+), 37 deletions(-)
copy
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{analysis/indicator/annotation/Arg.java
=> storage/annotation/IDColumn.java} (80%)