Update NEWS and VERSION for 1.0.0-rc6

Signed-off-by: Thomas Graf <thomas@cilium.io>
cilium · Mar 2, 2018 · 8703e8d · 8703e8d
1 parent 5e90ac8
commit 8703e8d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/NEWS.rst b/NEWS.rst
@@ -2,6 +2,25 @@
 NEWS
 ******
 
+
+v1.0.0-rc6
+==========
+
+:date: 2018-03-02
+:commit: 5e90ac8271773a8d4cceca8b61511062489e845d
+
+Bugfixes Changes
+----------------
+
+* Envoy: add NACK processing (2991_ @jrajahalme)
+* envoy: Use downstream HTTP protocol for upstream connections. (2970_ @jrajahalme)
+
+Other Changes
+-------------
+
+* Removed action field from BPF policy map entries (2918_ @joestringer)
+
+
 Version 1.0-rc5
 ===============
 
@@ -1115,3 +1134,6 @@ Fixes
 .. _2852: https://github.com/cilium/cilium/pull/2852
 .. _2821: https://github.com/cilium/cilium/pull/2821
 .. _2806: https://github.com/cilium/cilium/pull/2806
+.. _2991: https://github.com/cilium/cilium/pull/2991
+.. _2970: https://github.com/cilium/cilium/pull/2970
+.. _2918: https://github.com/cilium/cilium/pull/2918
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.0-rc5
+1.0.0-rc6
diff --git a/examples/getting-started/Vagrantfile b/examples/getting-started/Vagrantfile
@@ -4,9 +4,9 @@
 Vagrant.require_version ">= 1.8.3"
 
 num_nodes = (ENV['NNODES'] || 1).to_i
-cilium_version = (ENV['CILIUM_VERSION'] || "v1.0.0-rc5")
+cilium_version = (ENV['CILIUM_VERSION'] || "v1.0.0-rc6")
 cilium_opts = (ENV['CILIUM_OPTS'] || "--kvstore consul --kvstore-opt consul.address 192.168.33.11:8500 -t vxlan")
-cilium_tag = (ENV['CILIUM_TAG'] || "v1.0.0-rc5")
+cilium_tag = (ENV['CILIUM_TAG'] || "v1.0.0-rc6")
 
 # This runs only once when vagrant box is provisioned for the first time
 $bootstrap = <<SCRIPT