[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2955/8267] poky.conf: Bump version for 2.2.0 morty release

[Emmanuele Bassi <ebassi src gnome org>]

commit 45a8da9477c8c2f0b26ad49e54f7cfbe3603148e
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Tue Oct 11 08:44:48 2016 +0100

    poky.conf: Bump version for 2.2.0 morty release
    
    (From meta-yocto rev: 4d72c9a750e531c6421fb094c1e7cfb74b770cf0)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta-poky/conf/distro/poky.conf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index 9585540..f84323c 100644
--- a/meta-poky/conf/distro/poky.conf
+++ b/meta-poky/conf/distro/poky.conf
@@ -1,7 +1,7 @@
 DISTRO = "poky"
 DISTRO_NAME = "Poky (Yocto Project Reference Distro)"
-DISTRO_VERSION = "2.1+snapshot-${DATE}"
-DISTRO_CODENAME = "master"
+DISTRO_VERSION = "2.2.0"
+DISTRO_CODENAME = "morty"
 SDK_VENDOR = "-pokysdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"