Date: Mon, 31 Oct 2011 13:05:12 -0400 From: Jason Hellenthal <jhell@DataIX.net> To: Martin Matuska <mm@freebsd.org> Cc: stable@freebsd.org Subject: Re: svn commit: r226946 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <20111031170511.GA42662@DataIX.net> In-Reply-To: <4EADC513.5080206@FreeBSD.org> References: <201110302103.p9UL3Cej084788@svn.freebsd.org> <20111030213419.GA56708@DataIX.net> <4EADC513.5080206@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Oct 30, 2011 at 10:43:47PM +0100, Martin Matuska wrote: > 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 ;-) > Haha ok, I will get right on that ;). Thought this was just added to that that file.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111031170511.GA42662>