diff options
| author | Richard Yao <[email protected]> | 2013-10-07 06:53:58 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-10-29 15:06:18 -0700 |
| commit | 632a242e8352f0a4684f41286a288689f97e504b (patch) | |
| tree | 388158a4e4d7d05df5060f37e5d921f0db8e1a05 | |
| parent | 20f04f08aa5032f1e958ba38654d9ed833b6b636 (diff) | |
Add missing copyright notices from Illumos
This resolves merge conflicts when merging Illumos #3588 and Illumos #4047.
Signed-off-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #1775
| -rw-r--r-- | include/sys/dmu.h | 1 | ||||
| -rw-r--r-- | module/zcommon/zfs_prop.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/sys/dmu.h b/include/sys/dmu.h index fd1460d5c..60d4aa58a 100644 --- a/include/sys/dmu.h +++ b/include/sys/dmu.h @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. */ diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c index 722995dc5..7e3563285 100644 --- a/module/zcommon/zfs_prop.c +++ b/module/zcommon/zfs_prop.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. */ /* Portions Copyright 2010 Robert Milkowski */ |