Merge pull request #46 from resin-os/release_v2.14.0+rev1

Release v2.14.0+rev1
2018-07-18 21:56:37 +03:00 · 2018-07-18 21:56:37 +03:00 · 58fd14c074
commit 58fd14c074
parent 5351da8fe9 941d457e31
5 changed files with 7 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,11 @@
 Change log
 -----------

+# v2.14.0+rev1
+## (2018-07-18)
+
+* Update the meta-resin submodule to version v2.14.0 [Florin]
+
 # v2.13.6+rev1
 ## (2018-07-13)

--- a/2
+++ b/2
@ -1 +1 @@
-2.13.6+rev1
+2.14.0+rev1
--- a/layers/meta-resin
+++ b/layers/meta-resin
@ -1 +1 @@
-Subproject commit e167839b84b4e93313942a47078a896a6e32b6a2
+Subproject commit 2c4ac61bc17188b35d98263378ed961c2a30519a
--- a/layers/meta-resin-allwinner/conf/samples/local.conf.sample
+++ b/layers/meta-resin-allwinner/conf/samples/local.conf.sample
@ -3,8 +3,6 @@
 #MACHINE ?= "nanopi-neo-air"

 # More info meta-resin/README.md
-#RESIN_CONNECTABLE ?= "1"
-#RESIN_CONNECTABLE_ENABLE_SERVICES ?= "0"
 #TARGET_REPOSITORY ?= ""
 #TARGET_TAG ?= ""
 BALENA_STORAGE = "overlay2"
--- a/layers/meta-resin-allwinner/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend
+++ b/layers/meta-resin-allwinner/recipes-containers/docker-disk/docker-resin-supervisor-disk.bbappend