[src/netbsd-7]: src/doc Ticket 949 and 950.

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf0b8b698812
branches:  netbsd-7
changeset: 799571:cf0b8b698812
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Aug 14 05:33:34 2015 +0000

description:
Ticket 949 and 950.

diffstat:

 doc/CHANGES-7.0 |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 71a428dbe5a9 -r cf0b8b698812 doc/CHANGES-7.0
--- a/doc/CHANGES-7.0   Fri Aug 14 05:32:39 2015 +0000
+++ b/doc/CHANGES-7.0   Fri Aug 14 05:33:34 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.366 2015/08/11 08:29:03 sborrill Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.367 2015/08/14 05:33:34 msaitoh Exp $
 
 A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
 until the 7.0 release:
@@ -33913,3 +33913,12 @@
        Welcome to 7.0_RC3!
        [snj]
 
+sys/ufs/ffs/ffs_alloc.c                                1.151
+
+       Need wapbl transaction around ffs_blkfree_cg.  Fixes wapbl+discard.
+       [riastradh, ticket #949]
+
+crypto/external/bsd/openssh/dist/monitor.c     patch
+
+       OpenSSH PAM fix (BFS-SA-2015-002).
+       [christos, ticket #950]