diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-01-12 13:04:18 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-01-12 13:04:18 +0000 |
| commit | c01753e18ca18fcdabe7ca7868cf40dd18290c51 (patch) | |
| tree | e38a71b71cf3eef7d8a8112dfb2055d5463b80eb /usr/src/cmd/Makefile | |
| parent | 0c4959f576fd0569de9fb1c72946987be101e7a0 (diff) | |
| parent | ad309d3e2ef712dfdf1bc08758f232ebd5fe1612 (diff) | |
| download | illumos-joyent-c01753e18ca18fcdabe7ca7868cf40dd18290c51.tar.gz | |
[illumos-gate merge]
commit ad309d3e2ef712dfdf1bc08758f232ebd5fe1612
7761 bootfs_005_neg's pool destruction must handle EBUSY
commit 555da5111b0f2552c42d057b211aba89c9c79f6c
7743 per-vdev-zaps have no initialize path on upgrade
commit 0e93ddde309a21971dc41356b4834acecaeb9e20
7739 zfs_inherit_003_pos fails due to improperly generated random strings
commit 4648396c072c3d0c2a1a38afa5f6717799eb1ac7
7731 libdladm`i_dladm_set_single_prop() leaks memory when resetting properties without default value
commit 5f10ef697f250374b7b917e10961c4e02d4e3112
6396 remove SVM
Conflicts:
usr/src/cmd/dladm/Makefile
usr/src/cmd/Makefile.check
usr/src/lib/Makefile
usr/src/Makefile.lint
Diffstat (limited to 'usr/src/cmd/Makefile')
| -rw-r--r-- | usr/src/cmd/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile index 725c138e6b..94c75bd0f6 100644 --- a/usr/src/cmd/Makefile +++ b/usr/src/cmd/Makefile @@ -19,13 +19,15 @@ # CDDL HEADER END # +# # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright 2015 Nexenta Systems, Inc. All rights reserved. # Copyright 2016 Joyent, Inc. # Copyright (c) 2012 by Delphix. All rights reserved. # Copyright (c) 2013 DEY Storage Systems, Inc. All rights reserved. # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright 2016 Toomas Soome <tsoome@me.com> +# Copyright 2016 Nexenta Systems, Inc. +# include ../Makefile.master |