diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c8125d3e6..d25cb62ace 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Change log ----------- +# v2.2.0 - 2017-07-28 + +* Update supervisor to v6.1.2 [Pablo Carranza Velez] +* Support building with Yocto Pyro [Will Newton] +* Disable resin-sample NetworkManager connection [Will Newton] +* Remove support for Yocto Daisy [Will Newton] + # v2.1.0 - 2017-07-19 * Update supervisor to v6.0.1 [Pablo Carranza Velez] diff --git a/meta-resin-common/conf/distro/include/resin-os.inc b/meta-resin-common/conf/distro/include/resin-os.inc index f0485cab9a..6041eb1eff 100644 --- a/meta-resin-common/conf/distro/include/resin-os.inc +++ b/meta-resin-common/conf/distro/include/resin-os.inc @@ -3,7 +3,7 @@ require conf/distro/poky.conf DISTRO = "resin-os" DISTRO_NAME = "Resin OS" -DISTRO_VERSION = "2.1.0" +DISTRO_VERSION = "2.2.0" HOSTOS_VERSION = "${DISTRO_VERSION}" python () { ''' Set HOSTOS_VERSION from board VERSION if available '''