I'll import the other versions for the sake of compatibility. Unfortunately one of them is really specific to Solaris zones and doesn't get us anything.
-- Rui Paulo > On 26 Jun 2014, at 01:16, Pedro Giffuni <p...@freebsd.org> wrote: > > >> Il giorno 26/giu/2014, alle ore 02:21, Andriy Gapon <a...@freebsd.org> ha >> scritto: >> >>> On 26/06/2014 11:06, Rui Paulo wrote: >>> Author: rpaulo >>> Date: Thu Jun 26 07:06:43 2014 >>> New Revision: 267898 >>> URL: http://svnweb.freebsd.org/changeset/base/267898 >>> >>> Log: >>> Bring the following change from the illumos-joyent repository: >>> >>> commit 78e24ab6803bbe11ba37642624e1498ede5b239d >>> Author: Bryan Cantrill <br...@joyent.com> >>> Date: Thu Oct 31 01:20:54 2013 >>> >>> OS-1688 DTrace count() with histogram >>> OS-2360 DTrace full width distribution histograms >>> OS-2361 DTrace frequency trails >>> >>> MFC after: 2 weeks >> >> Seems like this change is in illumos already: >> >> commit 33093f5bcdc51014933497dd39374080c1ac5705 >> Author: Bryan Cantrill <br...@joyent.com> >> Date: Thu Oct 31 08:20:54 2013 +0000 >> >> 4471 DTrace count() with histogram >> 4472 DTrace full width distribution histograms >> 4473 DTrace frequency trails >> Reviewed by: Dan McDonald <dan...@omniti.com> >> Approved by: Gordon Ross <g...@nexenta.com> >> >> As such it would have been preferable to use our standard workflow and >> merge the change via the illumos vendor area. >> > > Indeed, this change is in the vendor area: > > http://svnweb.freebsd.org/base?view=revision&revision=266992 > > However the commit is wrong because: > > 1) It added files instead of copying them from/through the vendor area. > 2) It is not respecting the order in which upstream (Illumos AFAICT) adds > features so it breaks the sense of DT_VERS_LATEST > > I am aware that DTrace imports have not been respecting the regular merging > procedure but we are trying to work on that. Please fix at least (1), (2) > implies merging three commits that precede this one. > > Pedro. _______________________________________________ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
