Date: Fri, 1 Apr 2011 16:32:44 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 190744 for review Message-ID: <201104011632.p31GWiwf075245@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@190744?ac=10 Change 190744 by trasz@trasz_victim on 2011/03/29 19:38:51 Fix mismerge. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#24 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/sys/jail.h#24 (text+ko) ==== @@ -182,7 +182,6 @@ char pr_hostname[MAXHOSTNAMELEN]; /* (p) jail hostname */ char pr_domainname[MAXHOSTNAMELEN]; /* (p) jail domainname */ char pr_hostuuid[HOSTUUIDLEN]; /* (p) jail hostuuid */ - struct racct *pr_racct; /* (c) resource accounting */ }; #endif /* _KERNEL || _WANT_PRISON */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104011632.p31GWiwf075245>