Merge branch 'master' into enable_rpivid_kernel_module

balena-os · Feb 6, 2020 · 4285eea · 4285eea
2 parents f187b5f + 5d9caff
commit 4285eea
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,15 @@
+- commits:
+    - subject: Update balena-yocto-scripts to v1.5.4
+      hash: e9df26bfc1a885858e2ff12f30f7ff36be01bad8
+      body: ''
+      footer:
+        Changelog-entry: Update balena-yocto-scripts to v1.5.4
+        changelog-entry: Update balena-yocto-scripts to v1.5.4
+        Signed-off-by: Florin Sarbu <[email protected]>
+        signed-off-by: Florin Sarbu <[email protected]>
+      author: Florin Sarbu
+  version: 2.47.0+rev4
+  date: 2020-02-06T20:16:06.312Z
 - commits:
     - subject: Update meta-rust to include 1.36
       hash: 351beaf321c789f02ac3b6032361271c40072f97

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change log
 -----------
 
+# v2.47.0+rev4
+## (2020-02-06)
+
+* Update balena-yocto-scripts to v1.5.4 [Florin Sarbu]
+
 # v2.47.0+rev3
 ## (2020-02-06)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.47.0+rev3
+2.47.0+rev4