From e041603b30b7bf65acc89d7d5fd01494e569940e Mon Sep 17 00:00:00 2001 From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net> Date: Sat, 9 Nov 2019 15:48:42 +0700 Subject: [PATCH] [*] Merged fixes --- CMakeLists.txt | 2 +- libdap | 2 +- libdap-chain | 2 +- libdap-chain-crypto | 2 +- libdap-chain-cs-dag | 2 +- libdap-chain-cs-dag-poa | 2 +- libdap-chain-cs-dag-pos | 2 +- libdap-chain-gdb | 2 +- libdap-chain-global-db | 2 +- libdap-chain-mempool | 2 +- libdap-chain-net | 2 +- libdap-chain-net-srv-app | 2 +- libdap-chain-net-srv-app-db | 2 +- libdap-chain-net-srv-datum | 2 +- libdap-chain-net-srv-datum-pool | 2 +- libdap-chain-wallet | 2 +- libdap-client | 2 +- libdap-server | 2 +- libdap-server-core | 2 +- libdap-server-udp | 2 +- libdap-stream | 2 +- libdap-stream-ch | 2 +- libdap-stream-ch-chain | 2 +- libdap-stream-ch-chain-net | 2 +- libdap-stream-ch-chain-net-srv | 2 +- libdap-stream-ch-vpn | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ca23fc28..7a1c10eb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 2) SET( CPACK_PACKAGE_VERSION_MINOR 6) -SET( CPACK_PACKAGE_VERSION_PATCH 1) +SET( CPACK_PACKAGE_VERSION_PATCH 2) SET( CPACK_SYSTEM_NAME "debian-9.9-amd64") SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") diff --git a/libdap b/libdap index 33e7d24a9..ab957d57c 160000 --- a/libdap +++ b/libdap @@ -1 +1 @@ -Subproject commit 33e7d24a901b3da05b7a544b0f16e7819e5f9ddb +Subproject commit ab957d57c0e55df8bdeac52cd36b7258b03dee20 diff --git a/libdap-chain b/libdap-chain index 727b02e44..ec0498403 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit 727b02e44f3de250f30f07e85a77b7ca533c1381 +Subproject commit ec0498403cf7fb9de7e4c89bb41cbc4de27a5461 diff --git a/libdap-chain-crypto b/libdap-chain-crypto index edd115a5a..94899eb05 160000 --- a/libdap-chain-crypto +++ b/libdap-chain-crypto @@ -1 +1 @@ -Subproject commit edd115a5a70c61f291f1a23d2c9cd97e2580dad6 +Subproject commit 94899eb05efd7c66bdd6f88a73fb3e5e92f7daf9 diff --git a/libdap-chain-cs-dag b/libdap-chain-cs-dag index 32e3379f2..c33d57a9a 160000 --- a/libdap-chain-cs-dag +++ b/libdap-chain-cs-dag @@ -1 +1 @@ -Subproject commit 32e3379f20226742c8c3923542ad477a344c0d8d +Subproject commit c33d57a9a62b00ca52b4db5d0bcfc480ab2d909e diff --git a/libdap-chain-cs-dag-poa b/libdap-chain-cs-dag-poa index 89b08b17c..10ef1bf2d 160000 --- a/libdap-chain-cs-dag-poa +++ b/libdap-chain-cs-dag-poa @@ -1 +1 @@ -Subproject commit 89b08b17c7cc88084b73618eb50d7981d5841039 +Subproject commit 10ef1bf2d2a1688a159a87613bb2417c5176d98c diff --git a/libdap-chain-cs-dag-pos b/libdap-chain-cs-dag-pos index ec95a81cb..87759842e 160000 --- a/libdap-chain-cs-dag-pos +++ b/libdap-chain-cs-dag-pos @@ -1 +1 @@ -Subproject commit ec95a81cb57f76695978653e3f114c8fadc86fb7 +Subproject commit 87759842ed0159a065cf374ce01194174949bce4 diff --git a/libdap-chain-gdb b/libdap-chain-gdb index 09e66a5af..e9d57285c 160000 --- a/libdap-chain-gdb +++ b/libdap-chain-gdb @@ -1 +1 @@ -Subproject commit 09e66a5af669b96d449dca2aa31a5110a20c4586 +Subproject commit e9d57285c3d2383e13e1d949935628cb56c694cc diff --git a/libdap-chain-global-db b/libdap-chain-global-db index 8a2ada22f..6a574e4bd 160000 --- a/libdap-chain-global-db +++ b/libdap-chain-global-db @@ -1 +1 @@ -Subproject commit 8a2ada22f759cb41241152c6e6db6a7b7cf5b9d2 +Subproject commit 6a574e4bd23354672773a9e4b8cbb2b656249c15 diff --git a/libdap-chain-mempool b/libdap-chain-mempool index a8470d724..86046978d 160000 --- a/libdap-chain-mempool +++ b/libdap-chain-mempool @@ -1 +1 @@ -Subproject commit a8470d724c512d2c2a0ae595a6fdc76fca5dc3a3 +Subproject commit 86046978d73ef5902292123e829d4a7cf4ac561f diff --git a/libdap-chain-net b/libdap-chain-net index d86852191..63280b31c 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit d86852191d6171c71be1ea8213e2c4da4ba42963 +Subproject commit 63280b31c530248a80573dacd8f02ea53c1ec1b9 diff --git a/libdap-chain-net-srv-app b/libdap-chain-net-srv-app index 687c93b6b..e5f23784d 160000 --- a/libdap-chain-net-srv-app +++ b/libdap-chain-net-srv-app @@ -1 +1 @@ -Subproject commit 687c93b6bea96ea61643b9291ff63854fcfec4bd +Subproject commit e5f23784de6b8cc16b80b4bc755c67df5fc7565f diff --git a/libdap-chain-net-srv-app-db b/libdap-chain-net-srv-app-db index 26383433d..ce7f0333b 160000 --- a/libdap-chain-net-srv-app-db +++ b/libdap-chain-net-srv-app-db @@ -1 +1 @@ -Subproject commit 26383433d779c08de1202777d7a59a28661e2e39 +Subproject commit ce7f0333b77f8290428949b593e0ca2bd3df01b3 diff --git a/libdap-chain-net-srv-datum b/libdap-chain-net-srv-datum index 68a210096..5186f865f 160000 --- a/libdap-chain-net-srv-datum +++ b/libdap-chain-net-srv-datum @@ -1 +1 @@ -Subproject commit 68a210096b429cb52eeb554d813dcde60b5001fe +Subproject commit 5186f865f3a1bd10ef61f3cb039d85c9b32c7ad7 diff --git a/libdap-chain-net-srv-datum-pool b/libdap-chain-net-srv-datum-pool index 58ce43ef4..0eb7c0802 160000 --- a/libdap-chain-net-srv-datum-pool +++ b/libdap-chain-net-srv-datum-pool @@ -1 +1 @@ -Subproject commit 58ce43ef4a62920a060d3cbb15b971ca7e5f66aa +Subproject commit 0eb7c08027ff1a643c90b5ca59a8e4267e71ca6f diff --git a/libdap-chain-wallet b/libdap-chain-wallet index 667ebb8a9..612b4290d 160000 --- a/libdap-chain-wallet +++ b/libdap-chain-wallet @@ -1 +1 @@ -Subproject commit 667ebb8a98add85b06ce32e7b5faf4e33079a370 +Subproject commit 612b4290de348c137c0feb0e865fd762a5951c8d diff --git a/libdap-client b/libdap-client index f79a79029..1590bd07f 160000 --- a/libdap-client +++ b/libdap-client @@ -1 +1 @@ -Subproject commit f79a79029bb0f8e14ba91a50954e4882159ec764 +Subproject commit 1590bd07fd8d40b8eb956a0f6e55a58400bd326e diff --git a/libdap-server b/libdap-server index 9e7533d55..a194011ac 160000 --- a/libdap-server +++ b/libdap-server @@ -1 +1 @@ -Subproject commit 9e7533d55957ae9c141d88058de8ba85879037b6 +Subproject commit a194011ac545126faa9b0a566c4f4d79fb8a16a0 diff --git a/libdap-server-core b/libdap-server-core index 4f37a7b68..73a86ef82 160000 --- a/libdap-server-core +++ b/libdap-server-core @@ -1 +1 @@ -Subproject commit 4f37a7b680a178a4d65e876cf09a564947b29d5b +Subproject commit 73a86ef8202ee67a05098d186aac2deacb207f63 diff --git a/libdap-server-udp b/libdap-server-udp index bc2b2cc19..a14daa6c3 160000 --- a/libdap-server-udp +++ b/libdap-server-udp @@ -1 +1 @@ -Subproject commit bc2b2cc19bf7d0bb220bf65277304ae135196309 +Subproject commit a14daa6c39aed9bba32684872d03afc7778db61e diff --git a/libdap-stream b/libdap-stream index 3f52f8671..88f2900f2 160000 --- a/libdap-stream +++ b/libdap-stream @@ -1 +1 @@ -Subproject commit 3f52f8671d2c2c8761b7671081d0f5dcc249d8f0 +Subproject commit 88f2900f2b031160ec6d6e34c96414a52cfeeda2 diff --git a/libdap-stream-ch b/libdap-stream-ch index 4cb193815..705201cc5 160000 --- a/libdap-stream-ch +++ b/libdap-stream-ch @@ -1 +1 @@ -Subproject commit 4cb19381567085019e7a20666c38dbb7a13754ac +Subproject commit 705201cc5f34bd75732b7d1453eda1e279b575e4 diff --git a/libdap-stream-ch-chain b/libdap-stream-ch-chain index e261dfd63..d614be377 160000 --- a/libdap-stream-ch-chain +++ b/libdap-stream-ch-chain @@ -1 +1 @@ -Subproject commit e261dfd63807d9fdf3848f5dca4f692b1b6fdd51 +Subproject commit d614be3773d73516d7f56f3f439232a3a09539d7 diff --git a/libdap-stream-ch-chain-net b/libdap-stream-ch-chain-net index fbc53b02f..6875d05d0 160000 --- a/libdap-stream-ch-chain-net +++ b/libdap-stream-ch-chain-net @@ -1 +1 @@ -Subproject commit fbc53b02fbe8ae852a2bae346e06fc6d6d23cbb8 +Subproject commit 6875d05d0d3c3da2c9562b4840f48a5267e865ca diff --git a/libdap-stream-ch-chain-net-srv b/libdap-stream-ch-chain-net-srv index f9e047fd1..c4aaeb6d0 160000 --- a/libdap-stream-ch-chain-net-srv +++ b/libdap-stream-ch-chain-net-srv @@ -1 +1 @@ -Subproject commit f9e047fd1a670bd4427708f55fbc2747c5878c21 +Subproject commit c4aaeb6d0399125738e1f1ba671e442c16e42875 diff --git a/libdap-stream-ch-vpn b/libdap-stream-ch-vpn index 2ba9406f5..ad9fa3e06 160000 --- a/libdap-stream-ch-vpn +++ b/libdap-stream-ch-vpn @@ -1 +1 @@ -Subproject commit 2ba9406f59d6afa530a408a9cc3af5f9148fd648 +Subproject commit ad9fa3e066ba09f9e935e3801689c23e86e24923 -- GitLab