From 34f9240e8dbafd0821377dee4502d9fcb5b2e0e7 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 30 Nov 2021 11:06:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?raft=20consensus=20=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 3b533cb9..509b6c8e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 3b533cb94bec300c6bc4935d3c0a2db0257c19a4 +Subproject commit 509b6c8e29a0013f9d9e1359a6af29cb18c5905e From bb2135937c26b9d5dbacdf6f96669b21a0a78798 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Tue, 30 Nov 2021 11:23:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0framework=E5=88=86?= =?UTF-8?q?=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 1 + framework | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index ec3fca5a..7935a520 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,7 @@ [submodule "framework"] path = framework url = git@github.com:blockchain-jd-com/jdchain-framework.git + branch = 1b8f848 [submodule "core"] path = core url = git@github.com:blockchain-jd-com/jdchain-core.git diff --git a/framework b/framework index 95e75db7..1b8f8481 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 95e75db78ab53e91d9ff93560e2318b0408e3d89 +Subproject commit 1b8f8481d8ae1e2360e07008b20f1bab69dc3350 From b7446b260e93496db91c55dd70c88b18a0340e34 Mon Sep 17 00:00:00 2001 From: wangzhiyong69 Date: Thu, 2 Dec 2021 10:06:41 +0800 Subject: [PATCH 3/3] update core module --- core | 2 +- framework | 2 +- libs/bft-smart | 2 +- libs/binary-proto | 2 +- libs/httpservice | 2 +- libs/utils | 2 +- test | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core b/core index 509b6c8e..f1a08230 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 509b6c8e29a0013f9d9e1359a6af29cb18c5905e +Subproject commit f1a0823040b82b510fd79bc953cd3ccd20b23229 diff --git a/framework b/framework index 1b8f8481..7744d79d 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 1b8f8481d8ae1e2360e07008b20f1bab69dc3350 +Subproject commit 7744d79d4a11b559ed86e64f888bc05f0fda2639 diff --git a/libs/bft-smart b/libs/bft-smart index d64b566a..db6cbc79 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit d64b566a4eca23655c7ae8cfc2f5f5873004212c +Subproject commit db6cbc794fc941b799ce2ccdf8f969c5b3ee9403 diff --git a/libs/binary-proto b/libs/binary-proto index 2fec50a4..4b8a14a0 160000 --- a/libs/binary-proto +++ b/libs/binary-proto @@ -1 +1 @@ -Subproject commit 2fec50a46f0c8cbc62a46b057d199b722ad7bc8b +Subproject commit 4b8a14a05c8d4b4ef9f9390cc4255c5b84788024 diff --git a/libs/httpservice b/libs/httpservice index a6cb4583..55190ca8 160000 --- a/libs/httpservice +++ b/libs/httpservice @@ -1 +1 @@ -Subproject commit a6cb4583fc6271ce62e2b8b1d6273c3bdd03b810 +Subproject commit 55190ca843098d30740e61aa1911239983fdd032 diff --git a/libs/utils b/libs/utils index 6b2fee07..7f0b301a 160000 --- a/libs/utils +++ b/libs/utils @@ -1 +1 @@ -Subproject commit 6b2fee074500d7233dc1134ffdf1327325abedff +Subproject commit 7f0b301addd9ec6237c2c947cdb629b12831fd43 diff --git a/test b/test index 87fae6a8..24dca7cc 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 87fae6a8e6795433a0c07c1bbc0129c1e964b400 +Subproject commit 24dca7ccdca0d6b8d7d765a1edd7e24427b04470