From 890d266ad912088838c914afde31a1b3fd498bde Mon Sep 17 00:00:00 2001 From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net> Date: Fri, 8 Nov 2019 18:22:08 +0700 Subject: [PATCH] [*] 2.6 branch release. Important features: cdb, orders, servers_list ) --- CMakeLists.txt | 4 ++-- libdap-chain-net-srv-vpn | 2 +- libdap-server-http-db-auth | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54e8be072..2be6f6973 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,8 +45,8 @@ SET(DESTDIR "/opt/${PROJECT_NAME}") SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 2) -SET( CPACK_PACKAGE_VERSION_MINOR 5) -SET( CPACK_PACKAGE_VERSION_PATCH 21) +SET( CPACK_PACKAGE_VERSION_MINOR 6) +SET( CPACK_PACKAGE_VERSION_PATCH 0) 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-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index 4648cedf2..9ef4252a2 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit 4648cedf27769ff281c3af5ba6e2aef31d1c8b4a +Subproject commit 9ef4252a206fac816b9566dc98fc727a0b83970b diff --git a/libdap-server-http-db-auth b/libdap-server-http-db-auth index 18f51b402..6721535cf 160000 --- a/libdap-server-http-db-auth +++ b/libdap-server-http-db-auth @@ -1 +1 @@ -Subproject commit 18f51b402414a6e0f9217a6e4f84fde3724eb926 +Subproject commit 6721535cf4d0734a3305ccabc3f3b61f8adec902 -- GitLab