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/cmd | |
| 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/cmd')
| -rw-r--r-- | usr/src/cmd/zdb/zdb.c | 1 | ||||
| -rw-r--r-- | usr/src/cmd/zfs/zfs_main.c | 1 | ||||
| -rw-r--r-- | usr/src/cmd/zstreamdump/zstreamdump.c | 1 | ||||
| -rw-r--r-- | usr/src/cmd/ztest/ztest.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/cmd/zdb/zdb.c b/usr/src/cmd/zdb/zdb.c index 5746d6492a..4d609a7870 100644 --- a/usr/src/cmd/zdb/zdb.c +++ b/usr/src/cmd/zdb/zdb.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2015 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <stdio.h> diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index f9fa9ceb64..8ebe2b5f94 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -26,6 +26,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] */ #include <assert.h> diff --git a/usr/src/cmd/zstreamdump/zstreamdump.c b/usr/src/cmd/zstreamdump/zstreamdump.c index 4d884c74e7..3b390a4663 100644 --- a/usr/src/cmd/zstreamdump/zstreamdump.c +++ b/usr/src/cmd/zstreamdump/zstreamdump.c @@ -26,6 +26,7 @@ /* * Copyright (c) 2013, 2014 by Delphix. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ #include <ctype.h> diff --git a/usr/src/cmd/ztest/ztest.c b/usr/src/cmd/ztest/ztest.c index 764008f5b8..0b238eba6f 100644 --- a/usr/src/cmd/ztest/ztest.c +++ b/usr/src/cmd/ztest/ztest.c @@ -23,6 +23,7 @@ * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. + * Copyright (c) 2014 Integros [integros.com] */ /* |