From: Balazs Szekeres <balazs.szekeres@nokia.com>
Date: Wed, 13 Nov 2019 15:54:47 +0000 (+0100)
Subject: DANM update
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-danm.git;a=commitdiff_plain;h=4b2ffa5ec4e454939b7e887f30f11c8aa6c52a82

DANM update

Parallel confman update handling further updated
Added new UTs to cover all possible conflicting update scenarios
Added proper handling for parallel writes to confman

Change-Id: I7ca0493041d4ccd3a0cfa5fde8ba3faa9d899bf7
Signed-off-by: Balazs Szekeres <balazs.szekeres@nokia.com>
---

diff --git a/SPECS/caas-danm.spec b/SPECS/caas-danm.spec
index 1885d62..28edf36 100644
--- a/SPECS/caas-danm.spec
+++ b/SPECS/caas-danm.spec
@@ -15,8 +15,8 @@
 %define COMPONENT danm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 4.1.0
-%define RPM_MINOR_VERSION 1
-%define DANM_VERSION 93b46c01682b492efec9c4661990d89976d2e3e5
+%define RPM_MINOR_VERSION 2
+%define DANM_VERSION d3ecc88cb04d55373ff789de52427c9de2c438d3
 %define CNI_VERSION 0.8.1
 %define go_version 1.12.10
 %define SRIOV_VERSION 9e4c973b2ac517c64867e33d61aee152d70dc330
diff --git a/SPECS/caas-hyperdanm.spec b/SPECS/caas-hyperdanm.spec
index 7a07092..92574ef 100644
--- a/SPECS/caas-hyperdanm.spec
+++ b/SPECS/caas-hyperdanm.spec
@@ -15,8 +15,8 @@
 %define COMPONENT hyperdanm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 4.1.0
-%define RPM_MINOR_VERSION 1
-%define DANM_VERSION 93b46c01682b492efec9c4661990d89976d2e3e5
+%define RPM_MINOR_VERSION 2
+%define DANM_VERSION d3ecc88cb04d55373ff789de52427c9de2c438d3
 %define go_version 1.12.10
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define danm_components netwatcher svcwatcher webhook