kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
ascrutae 2016-06-15 16:06:09 +08:00
parent 5a7c287018 9d51733e52
commit 99d25290d3
4 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -4,6 +4,7 @@ install:
- mvn install:install-file -Dfile=jmxtools-1.2.1.jar -DgroupId=com.sun.jdmk -DartifactId=jmxtools -Dversion=1.2.1 -Dpackaging=jar
- mvn install:install-file -Dfile=jmxri-1.2.1.jar -DgroupId=com.sun.jmx -DartifactId=jmxri -Dversion=1.2.1 -Dpackaging=jar
- mvn install:install-file -Dfile=dubbox-2.8.4.jar -DgroupId=com.alibaba -DartifactId=dubbox -Dversion=2.8.4 -Dpackaging=jar
- mvn install:install-file -Dfile=ojdbc14-10.2.0.4.0.jar -DgroupId=com.oracle -DartifactId=ojdbc14 -Dversion=10.2.0.4.0 -Dpackaging=jar
- cd ..
script:

BIN
ci-dependencies/ojdbc14-10.2.0.4.0.jar Normal file
View File

Binary file not shown.

2
skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java
View File

@ -144,7 +144,7 @@ public class AlarmMessageProcessor {
+ (exceptionAlarmSize > 0 ? exceptionAlarmSize
+ " tid of system exceptions, " : "");
if (count > exceptionAlarmSize) {
title += (count - exceptionAlarmSize) + " tid of warings, ";
title += (count - exceptionAlarmSize) + " tid of warnings, ";
}
title += "between "
+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(

2
skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java
View File

@ -4,7 +4,7 @@ public class Constants {
/**
* 务必严格保持两位的version
*/
public static String SDK_VERSION = "1.0-Final";
public static String SDK_VERSION = "1.0Final";
public static final String HEALTH_DATA_SPILT_PATTERN = "^~";