diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-11-13 14:19:02 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-11-13 14:19:02 +0000 |
| commit | 18c287fc3f8cf898ea712e14bffd2e0c12f1bdae (patch) | |
| tree | d2d634658b24bc12ab5c4ced319b036c6c502b5c /exception_lists/copyright | |
| parent | 5001fda30a08f581fac0a2e3702eed3b5bbca2f3 (diff) | |
| parent | 81f499d2b4ccf5e24f8550abdfaf18142b430f5f (diff) | |
| download | illumos-joyent-18c287fc3f8cf898ea712e14bffd2e0c12f1bdae.tar.gz | |
[illumos-gate merge]
commit 81f499d2b4ccf5e24f8550abdfaf18142b430f5f
8761 IPv6 default policy table needs update for RFC6724
commit 62ba43a590f5c5aad74961c6c0d2c1703599b40c
8779 mech_spnego: variable set but not used
commit 9992e6a682b1c35b4385c3b512db329ec8ab9ede
4701 would like grep context options (-A, -B, -C)
commit 720b16875295d57e0e6a4e0ec32db4d47412f896
8789 usbgem: variable set but unused
commit 8629b981ede6d47b0583ca2d3e62baeaa4f26e93
8768 lib/hal: variable set but not used
commit d7dc20313645bcb9c9960a816baebe924d60bcf3
8764 rup: variable set but not used
commit f667abe5ff605062ba1d9222a7ff814d54b420d8
8736 amt: variable set but not used
commit cebd8f5216039c4a8d4553a19d3e8e4ff25ab941
8737 vi: variable set but not used
commit b960a2708664bae74456527012602c0464e7f8ef
8756 tools: btxld should be able to only add version
Conflicts:
usr/src/test/util-tests/tests/Makefile
exception_lists/copyright
Diffstat (limited to 'exception_lists/copyright')
| -rw-r--r-- | exception_lists/copyright | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/exception_lists/copyright b/exception_lists/copyright index 9bf09f0be0..0f65caf5a3 100644 --- a/exception_lists/copyright +++ b/exception_lists/copyright @@ -408,6 +408,8 @@ usr/src/lib/libsmbfs/smb/spnego.c usr/src/lib/libsmbfs/smb/spnegoparse.[ch] usr/src/test/util-tests/tests/dis/*/*.out usr/src/test/util-tests/tests/libsff/*.out +usr/src/test/util-tests/tests/grep_xpg4/files/gout* +usr/src/test/util-tests/tests/grep_xpg4/files/test* usr/src/test/zfs-tests/tests/functional/history/*Z usr/src/test/zfs-tests/tests/functional/history/*txt usr/src/tools/btxld/btx.h |