4206 history_003_pos relies on exact size of history log and entries
4207 history_008_pos depends on obsolete internal history log message
4208 Typo in zfs_main.c: "posxiuser"
4209 Populate zfstest with the remainder of the STF tests
Reviewed by: Sonu Pillai <sonu.pillai@delphix.com>
Reviewed by: Will Guyette <will.guyette@delphix.com>
Reviewed by: Eric Diven <eric.diven@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>

          --- old/exception_lists/keywords
          +++ new/exception_lists/keywords

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #

  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  22   22  # Copyright 2011 Nexenta Systems, Inc. All rights reserved.
       23 +# Copyright (c) 2013 by Delphix. All rights reserved.
  23   24  #
  24   25  
  25   26  syntax: glob
  26   27  usr/src/cmd/localedef/data/zh_CN.UTF-8.src
  27   28  usr/src/cmd/localedef/data/zh_HK.UTF-8.src
  28   29  usr/src/cmd/localedef/data/zh_MO.UTF-8.src
  29   30  usr/src/cmd/localedef/data/zh_SG.UTF-8.src
  30   31  usr/src/cmd/localedef/data/zh_TW.UTF-8.src
  31   32  usr/src/cmd/terminfo/termcap.src
  32   33  usr/src/cmd/terminfo/terminfo.src
  33   34  usr/src/cmd/zonestat/zonestat/zonestat.c
  34   35  usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v15.dat.bz2
       36 +usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib
  35   37  usr/src/test/test-runner/cmd/run.py
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX