From 3367e32d0fa92515efe61f6963767700a8701d98 Mon Sep 17 00:00:00 2001
From: Rene Peinthor <rene.peinthor@linbit.com>
Date: Fri, 18 Dec 2020 08:40:04 +0000
Subject: [PATCH] prepare release v1.11.0

---
 Dockerfile.controller     |  4 ++--
 Dockerfile.satellite      |  4 ++--
 debian/changelog          | 50 +++++++++++++++++++++++++++++++++++++++
 docs/rest_v1_openapi.yaml |  2 +-
 linstor.spec              |  5 +++-
 5 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/Dockerfile.controller b/Dockerfile.controller
index b67a2e1e8..583a09f60 100644
--- a/Dockerfile.controller
+++ b/Dockerfile.controller
@@ -1,6 +1,6 @@
 FROM centos:centos7 as builder
 
-ENV LINSTOR_VERSION 1.10.0
+ENV LINSTOR_VERSION 1.11.0
 
 ENV LINSTOR_TGZNAME linstor-server
 ENV LINSTOR_TGZ ${LINSTOR_TGZNAME}-${LINSTOR_VERSION}.tar.gz
@@ -47,7 +47,7 @@ FROM registry.access.redhat.com/ubi7/ubi
 MAINTAINER Roland Kammerer <roland.kammerer@linbit.com>
 
 # ENV can not be shared between builder and "main"
-ENV LINSTOR_VERSION 1.10.0
+ENV LINSTOR_VERSION 1.11.0
 ARG release=1
 
 LABEL name="linstor-controller" \
diff --git a/Dockerfile.satellite b/Dockerfile.satellite
index d92abc3f8..55d51beeb 100644
--- a/Dockerfile.satellite
+++ b/Dockerfile.satellite
@@ -1,6 +1,6 @@
 FROM centos:centos7 as builder
 
-ENV LINSTOR_VERSION 1.10.0
+ENV LINSTOR_VERSION 1.11.0
 ARG ARCH=amd64
 
 ENV LINSTOR_TGZNAME linstor-server
@@ -53,7 +53,7 @@ RUN cd ${HOME}/${LINSTOR_TGZNAME}-${LINSTOR_VERSION} && \
 FROM quay.io/linbit/drbd-utils
 # this is/needs to be based on registry.access.redhat.com/ubi7/ubi
 
-ENV LINSTOR_VERSION 1.10.0
+ENV LINSTOR_VERSION 1.11.0
 ARG release=1
 ARG ARCH=amd64
 
diff --git a/debian/changelog b/debian/changelog
index 19aa6e70e..74b6c7449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,53 @@
+linstor-server (1.11.0-1) experimental; urgency=medium
+
+  [ Rene Peinthor ]
+  * gradle: update dependency keyword usage
+  * docker: use gradle-wrapper on non lbbuild runs
+  * makefile: use gradlew for all non lbbuild tasks
+  * debian/control: remove gradle build dep
+  * doc/rest-api: fix incorrect ApiCall answer type
+  * gitlab: use internal docker registry
+  * gradle: update 3rd party libs
+  * ctrlrscdeleteapi: move ensureNotLastDisk to helper class
+  * node-delete: Check that node delete wouldn't fail because of resources
+  * PropertyBuilder: fix build
+  * rsc-create: do not report an error if resource already exists
+  * node-restore: use apiconsts instead of internal
+  * rest-api-doc: update rest property docu
+
+  [ Johanna Kucera ]
+  * props-info: add unit and dflt to property info
+  * props-info: add api-entrypoints to get the property info, add seperate [...]
+  * slight code cleanup
+  * fix auto-evict
+  * auto-evict: don't try reconnect to evicted nodes
+  * auto-evict: add AUTO_EVICT_ALLOW_EVICTION
+  * auto-evict: do not allow evicted nodes to reconnect
+  * rest-api-doc: added node restore endpoint documentation
+  * SnapshotShipping: allow configuration of used port range
+  * LayerRscIdPool: Fix ctrl-prop
+  * SnapshotShipping: blacklist already in use ports
+  * SnapshotShipping: retry immediately if port already in use
+  * SnapshotShipping: allow setting PREF_TARGET_NIC
+
+  [ Gabor Hernadi ]
+  * build.gradle: Fixed showMe*Cache tasks
+  * StorConfReader: Fixed NPE
+  * FileProvider: Fixed getSize bug
+  * ConfFileBuilder: Extend prioprops
+  * NodeLost: Fixes DB-Ref violation with snapshots
+  * TxSet: Fixed incorrect dirty-check
+  * Autoplace: Allow additionalPlaceCount
+  * Autoplacer: Allow placing diskless resources
+  * Auto*: Added AutoHelperContext
+  * AutoTiebreaker: use autoplacer for selection
+  * Autoplacer: only count diskless if placing diskless
+  * Autoplace: Fix incorrectly logged rsc-count
+  * Autoplacer: Do not mix storage pool kinds
+  * Autoplace: include additionalPlaceCount in response
+
+ -- Rene Peinthor <rene.peinthor@linbit.com>  Fri, 18 Dec 2020 08:39:38 +0000
+
 linstor-server (1.10.0-1) experimental; urgency=medium
 
   [ Rene Peinthor ]
diff --git a/docs/rest_v1_openapi.yaml b/docs/rest_v1_openapi.yaml
index 703f5cefe..c3370379a 100644
--- a/docs/rest_v1_openapi.yaml
+++ b/docs/rest_v1_openapi.yaml
@@ -21,7 +21,7 @@ info:
 
     Changelog:
 
-    * unreleased
+    * 1.6.0
        - Added PropsInfoAll, PropsInfo and PropsInfoDetails as well as these entrypoints:
           - /v1/controller/properties/info
           - /v1/controller/properties/info/all
diff --git a/linstor.spec b/linstor.spec
index 9e4a34d2e..df96e1ca4 100644
--- a/linstor.spec
+++ b/linstor.spec
@@ -1,5 +1,5 @@
 Name: linstor
-Version: 1.10.0
+Version: 1.11.0
 Release: 1%{?dist}
 Summary: LINSTOR SDS
 BuildArch: noarch
@@ -137,6 +137,9 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || :
 %systemd_preun linstor-satellite.service
 
 %changelog
+* Fri Dec 18 2020 Rene Peinthor <rene.peinthor@linbit.com> 1.11.0-1
+- New upstream release. Snapshot port config, Bug fixes
+
 * Mon Nov  9 2020 Rene Peinthor <rene.peinthor@linbit.com> 1.10.0-1
 - New upstream release. Auto-evict, etcd prefixes, Bug fixes.