diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-09 12:44:25 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-09 12:44:25 +0000 |
| commit | b3fd9b18977148b2e9e64a11e4667e7511c03dde (patch) | |
| tree | 0f920259d964e8eb6e531b0ab40793e0758103f0 /usr/src/lib | |
| parent | 8443e038ef8eb3ca6a95818d6e90b2a1eb4e9cb6 (diff) | |
| parent | d7e7cb9c207e40874f6a4b61ca8ea1526b5555bd (diff) | |
| download | illumos-joyent-b3fd9b18977148b2e9e64a11e4667e7511c03dde.tar.gz | |
[illumos-gate merge]
commit d7e7cb9c207e40874f6a4b61ca8ea1526b5555bd
6528 need casesensitivity/normalization test cases for zfs-tests
commit c3d26abc9ee97b4f60233556aadeb57e0bd30bb9
5027 zfs large block support (add copyright)
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs.h | 1 | ||||
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_dataset.c | 1 | ||||
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_sendrecv.c | 1 | ||||
| -rw-r--r-- | usr/src/lib/libzfs_core/common/libzfs_core.c | 1 | ||||
| -rw-r--r-- | usr/src/lib/libzfs_core/common/libzfs_core.h | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs.h b/usr/src/lib/libzfs/common/libzfs.h index 0125d9884f..b369b18671 100644 --- a/usr/src/lib/libzfs/common/libzfs.h +++ b/usr/src/lib/libzfs/common/libzfs.h @@ -25,6 +25,7 @@ * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _LIBZFS_H diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c index d282b0d9a5..034edebb24 100644 --- a/usr/src/lib/libzfs/common/libzfs_dataset.c +++ b/usr/src/lib/libzfs/common/libzfs_dataset.c @@ -27,6 +27,7 @@ * Copyright (c) 2013 Martin Matuska. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <ctype.h> diff --git a/usr/src/lib/libzfs/common/libzfs_sendrecv.c b/usr/src/lib/libzfs/common/libzfs_sendrecv.c index bc91979bee..ef659ff000 100644 --- a/usr/src/lib/libzfs/common/libzfs_sendrecv.c +++ b/usr/src/lib/libzfs/common/libzfs_sendrecv.c @@ -25,6 +25,7 @@ * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. * Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <assert.h> diff --git a/usr/src/lib/libzfs_core/common/libzfs_core.c b/usr/src/lib/libzfs_core/common/libzfs_core.c index 1013cf0d5f..76a0798d6b 100644 --- a/usr/src/lib/libzfs_core/common/libzfs_core.c +++ b/usr/src/lib/libzfs_core/common/libzfs_core.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2012, 2014 by Delphix. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* diff --git a/usr/src/lib/libzfs_core/common/libzfs_core.h b/usr/src/lib/libzfs_core/common/libzfs_core.h index d2d79175f6..938afbbc8f 100644 --- a/usr/src/lib/libzfs_core/common/libzfs_core.h +++ b/usr/src/lib/libzfs_core/common/libzfs_core.h @@ -21,6 +21,7 @@ /* * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #ifndef _LIBZFS_CORE_H |