Jason Hellenthal
2011-Oct-30 21:34 UTC
svn commit: r226946 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
On Sun, Oct 30, 2011 at 09:03:12PM +0000, Martin Matuska wrote:> Author: mm > Date: Sun Oct 30 21:03:12 2011 > New Revision: 226946 > URL: http://svn.freebsd.org/changeset/base/226946 > > > Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c > =============================================================================> --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Sun Oct 30 21:02:01 2011 (r226945) > +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Sun Oct 30 21:03:12 2011 (r226946) > @@ -21,6 +21,9 @@ > /* > * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. > */ > +/* > + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. > + */ >With (c) being a literal copyright symbol it seems to be missing above. -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 522 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20111030/148a93e7/attachment.pgp
Martin Matuska
2011-Oct-30 21:43 UTC
svn commit: r226946 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
On 30. 10. 2011 22:34, Jason Hellenthal wrote:> On Sun, Oct 30, 2011 at 09:03:12PM +0000, Martin Matuska wrote: >> Author: mm >> Date: Sun Oct 30 21:03:12 2011 >> New Revision: 226946 >> URL: http://svn.freebsd.org/changeset/base/226946 >> >> >> Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c >> =============================================================================>> --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Sun Oct 30 21:02:01 2011 (r226945) >> +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Sun Oct 30 21:03:12 2011 (r226946) >> @@ -21,6 +21,9 @@ >> /* >> * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. >> */ >> +/* >> + * Copyright 2011 Nexenta Systems, Inc. All rights reserved. >> + */ >> > With (c) being a literal copyright symbol it seems to be missing above.Hi Jason, this is a 1:1 upstream merge: http://hg.openindiana.org/upstream/illumos/illumos-gate/file/205481e35e49/usr/src/uts/common/fs/zfs/dmu_tx.c If you don't like it you can try to contact Illumos and/or Nexenta ;-) -- Martin Matuska FreeBSD committer http://blog.vx.sk