From cfee02cbf5055cf6f105aec05d465ac0e4826f8e Mon Sep 17 00:00:00 2001
From: FingerLiu <liupeng.dalian@gmail.com>
Date: Fri, 31 Aug 2018 17:26:37 +0800
Subject: [PATCH 1/2] [TRIVIAL] fix TYPO (#1616)

alphabeta to alphabet
---
 docs/users.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/users.md b/docs/users.md
index 8e7349522..b777a91a5 100644
--- a/docs/users.md
+++ b/docs/users.md
@@ -39,4 +39,4 @@ if any entity(company or organization) has any doubt, please contact us by [any
 - Weier. 广州文尔软件科技有限公司. https://www.site0.cn
 - Xiaomi. 小米. https://www.mi.com/en/
 - Yinji(shenzhen)Network Technology Co.,Ltd. 印记. http://www.yinjiyun.cn/
-The list is in alphabeta order.
+The list is in alphabet order.

From 9275eeaa7a7b4a8b24955728338a928ad902686d Mon Sep 17 00:00:00 2001
From: caoyixiong <32847163+IanCao@users.noreply.github.com>
Date: Fri, 31 Aug 2018 18:09:07 +0800
Subject: [PATCH 2/2]  FIx NPE in InstanceMetricAlarmAssertWorker (#1614)

* add user

* add user

* FIx NPE in InstanceMetricAlarmAssertWorker
---
 .../worker/instance/InstanceMetricAlarmAssertWorker.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceMetricAlarmAssertWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceMetricAlarmAssertWorker.java
index a0e9ad1c2..c6cd39932 100644
--- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceMetricAlarmAssertWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceMetricAlarmAssertWorker.java
@@ -66,7 +66,7 @@ public class InstanceMetricAlarmAssertWorker extends AlarmAssertWorker<InstanceM
         Instance instance = instanceDAO.getInstance(alarm.getInstanceId());
         JsonObject osInfo = gson.fromJson(instance.getOsInfo(), JsonObject.class);
         String serverName = Const.UNKNOWN;
-        if (osInfo.has("hostName")) {
+        if (osInfo != null && osInfo.has("hostName")) {
             serverName = osInfo.get("hostName").getAsString();
         }