From 254d6d56ac5c8bc476b26ce1f0019c3b186c0270 Mon Sep 17 00:00:00 2001
From: zhaoguangwei <zhaoguangwei@jd.com>
Date: Wed, 3 Jun 2020 17:31:19 +0800
Subject: [PATCH] merge the 1.1.5;

---
 core           | 2 +-
 framework      | 2 +-
 libs/bft-smart | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core b/core
index 5afafb53..78ebdeeb 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 5afafb536796160f0f6644c7955e0dc56632d141
+Subproject commit 78ebdeeb9e7671660772a200e40af87655edf37c
diff --git a/framework b/framework
index 7260fab6..4bab1a6b 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 7260fab6ee0336e2a197ddef7bebf2daf9363844
+Subproject commit 4bab1a6b842324f576f69089d56e1df67cd0528d
diff --git a/libs/bft-smart b/libs/bft-smart
index 1a3c32c4..214d3740 160000
--- a/libs/bft-smart
+++ b/libs/bft-smart
@@ -1 +1 @@
-Subproject commit 1a3c32c4090e3cf7551998366a4d26a0160451ec
+Subproject commit 214d3740ce553a475b6a524796895af33901cba4