From b2ad4b699527ccfc7433a6fcc0430a081634014e Mon Sep 17 00:00:00 2001
From: Ulric Qin <ulric.qin@gmail.com>
Date: Thu, 22 Oct 2020 17:49:15 +0800
Subject: [PATCH 1/2] upgrade 3.1.5

---
 changelog      | 3 +++
 control        | 2 +-
 script/send_im | 5 +++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100755 script/send_im

diff --git a/changelog b/changelog
index da10f44d..75655c59 100644
--- a/changelog
+++ b/changelog
@@ -14,3 +14,6 @@
 影响模块：index judge monapi rdb transfer tsdb
 更新内容：把hbs的逻辑从monapi挪到rdb，拆分监控的权限点
 
+3.1.5
+影响模块：monapi
+更新内容：清理策略的时候会空指针，node删除了，策略还在，此时会复现
diff --git a/control b/control
index d407a8eb..1e2647d7 100755
--- a/control
+++ b/control
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # release version
-version=3.1.4
+version=3.1.5
 
 CWD=$(cd $(dirname $0)/; pwd)
 cd $CWD
diff --git a/script/send_im b/script/send_im
new file mode 100755
index 00000000..c999fab9
--- /dev/null
+++ b/script/send_im
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "$1" >> /tmp/send_im.txt
+echo "$2" >> /tmp/send_im.txt
+echo "" >> /tmp/send_im.txt

From ecacc71596d9d7e2298394cf08903c2d850d4877 Mon Sep 17 00:00:00 2001
From: Ulric Qin <ulric.qin@gmail.com>
Date: Thu, 22 Oct 2020 17:50:32 +0800
Subject: [PATCH 2/2] pack script

---
 control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/control b/control
index 1e2647d7..25bd8f18 100755
--- a/control
+++ b/control
@@ -180,7 +180,7 @@ pack()
 	clock=$(date +%s)
 	mkdir $clock
 	mv etc/*.local.yml $clock
-	tar zcvf n9e-${version}.tar.gz control sql etc n9e-*
+	tar zcvf n9e-${version}.tar.gz script control sql etc n9e-*
 	mv $clock/* etc/
 	rm -rf $clock
 }