From: Carlos O'Donell <carlos_odonell@mentor.com>
Date: Thu, 29 Nov 2012 22:40:36 +0000 (-0800)
Subject: Update ChangeLog and NEWS for BZ #14197.
X-Git-Tag: upstream/2.30~9835
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f06cc227e21211c33a489ab084dd6a1f1bab7935;p=external%2Fglibc.git

Update ChangeLog and NEWS for BZ #14197.
---

diff --git a/ChangeLog b/ChangeLog
index 643a052..6c973b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
 
 2012-06-04  Florian Weimer  <fweimer@redhat.com>
 
+	[BZ #14197]
 	* debug/test-strcpy_chk.c: Mention __chk_fail ABI test.
 
 2012-11-28  David S. Miller  <davem@davemloft.net>
diff --git a/NEWS b/NEWS
index 0993276..e055231 100644
--- a/NEWS
+++ b/NEWS
@@ -14,15 +14,15 @@ Version 2.17
   12140, 13412, 13542, 13601, 13603, 13604, 13629, 13679, 13696, 13698,
   13717, 13741, 13759, 13761, 13763, 13881, 13939, 13950, 13952, 13966,
   14042, 14047, 14090, 14150, 14151, 14152, 14154, 14157, 14166, 14173,
-  14195, 14237, 14251, 14252, 14283, 14298, 14303, 14307, 14328, 14331,
-  14336, 14337, 14347, 14349, 14368, 14376, 14417, 14447, 14459, 14476,
-  14477, 14501, 14505, 14510, 14516, 14518, 14519, 14530, 14532, 14538,
-  14543, 14544, 14545, 14557, 14562, 14568, 14576, 14579, 14583, 14587,
-  14595, 14602, 14610, 14621, 14638, 14645, 14648, 14652, 14660, 14661,
-  14669, 14672, 14683, 14694, 14716, 14719, 14743, 14767, 14783, 14784,
-  14785, 14793, 14796, 14797, 14801, 14803, 14805, 14807, 14811, 14815,
-  14821, 14822, 14824, 14828, 14831, 14835, 14838, 14856, 14863, 14865,
-  14866, 14868, 14869, 14871, 14879, 14889.
+  14195, 14197, 14237, 14251, 14252, 14283, 14298, 14303, 14307, 14328,
+  14331, 14336, 14337, 14347, 14349, 14368, 14376, 14417, 14447, 14459,
+  14476, 14477, 14501, 14505, 14510, 14516, 14518, 14519, 14530, 14532,
+  14538, 14543, 14544, 14545, 14557, 14562, 14568, 14576, 14579, 14583,
+  14587, 14595, 14602, 14610, 14621, 14638, 14645, 14648, 14652, 14660,
+  14661, 14669, 14672, 14683, 14694, 14716, 14719, 14743, 14767, 14783,
+  14784, 14785, 14793, 14796, 14797, 14801, 14803, 14805, 14807, 14811,
+  14815, 14821, 14822, 14824, 14828, 14831, 14835, 14838, 14856, 14863,
+  14865, 14866, 14868, 14869, 14871, 14879, 14889.
 
 * CVE-2011-4609 svc_run() produces high cpu usage when accept fails with
   EMFILE has been fixed (Bugzilla #14889).