From e5bc111877e3366107e7ee2a131a413650a59dfa Mon Sep 17 00:00:00 2001
From: Rastislav Szabo <raszabo@cisco.com>
Date: Thu, 18 Oct 2018 12:39:47 +0200
Subject: [PATCH 1/2] Release notes for v1.5.0

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acd04cc637..37c3e98a87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# Release v1.5.0 (19.10.2018)
+
+### VPP
+ - version **v18.10-rc1~15-g347c523**
+
+### Bug Fixes
+ - race condition in DHCP notification handling
+ - added missing pull policy for init containers
+ - fixed issues in STN setup
+ - fixed some `contiv-netctl` and CRD issues
+ - minor IPAM fixes
+
+### New Features & Enhancements
+ - better handling of identity NAT on VPP
+ - k8s 1.12 compatibility
+
+
 # Release v1.4.0 (5.10.2018)
 
 ### VPP

From 9b528baa3abfeed26d8fc4ae1e314b78100578cc Mon Sep 17 00:00:00 2001
From: Rastislav Szabo <raszabo@cisco.com>
Date: Thu, 18 Oct 2018 12:42:58 +0200
Subject: [PATCH 2/2] Make target fix

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 29ce94c737..f09c272f9b 100644
--- a/Makefile
+++ b/Makefile
@@ -258,7 +258,7 @@ docker-images:
 	cd docker && ./build-all.sh -s
 	cd docker && ./push-all.sh -s
 
-docker-dev: agent contiv-init
+docker-dev: contiv-agent contiv-init
 	cd docker/development && ./build.sh
 
 vagrant-images: