From: Kevin Tian <kevin.tian@intel.com>
Date: Thu, 12 Aug 2010 03:31:37 +0000 (+0800)
Subject: distro-tracking: update MAINTAINER info for base group
X-Git-Tag: 2011-1~4892
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2d394b224a0a2776fcd918b2488cb6e623e516dd;p=openembedded-core.git

distro-tracking: update MAINTAINER info for base group

also add NO_UPDATE_REASON for packages marked #OK to stay with
an older version

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
---

diff --git a/meta/conf/distro/include/private/distro_base_utils_1.inc b/meta/conf/distro/include/private/distro_base_utils_1.inc
index d99c583da2..40578c27c5 100644
--- a/meta/conf/distro/include/private/distro_base_utils_1.inc
+++ b/meta/conf/distro/include/private/distro_base_utils_1.inc
@@ -324,6 +324,7 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-makedevs = "n/a"
 RECIPE_LATEST_RELEASE_DATE_pn-makedevs = "n/a"
 RECIPE_COMMENTS_pn-makedevs = ""
 RECIPE_MAINTAINER_pn-makedevs = "Dongxiao Xu <dongxiao.xu@intel.com>"
+<<<<<<< HEAD:meta/conf/distro/include/private/distro_base_utils_1.inc
 
 RECIPE_STATUS_pn-cwautomacros = "green"
 DEPENDENCY_CHECK_pn-cwautomacros = "not done"