[Open-scap] [PATCH] Update RHEL6 OVAL file to ignore world-writable files in /proc/ directory

[Petr Lautrbach]

On Tue, Jul 29, 2014 at 03:59:14AM -0400, Martin Preisler wrote:
> ----- Original Message -----
> > From: "Jakub Jelen" <jjelen at redhat.com>
> > To: "Martin Preisler" <mpreisle at redhat.com>
> > Cc: open-scap-list at redhat.com
> > Sent: Tuesday, July 29, 2014 9:39:35 AM
> > Subject: Re: [Open-scap] [PATCH] Update RHEL6 OVAL file to ignore world-writable files in /proc/ directory
> > 
> > Hello,
> > is it ok that it is merged in maint-1.0 branch? I wondered that i see in
> > test still the old results.
> > I guess it should be in upstream ...
> > 
> > [1]
> > https://git.fedorahosted.org/cgit/openscap.git/diff/dist/rhel6/scap-rhel6-oval.xml?h=maint-1.0
> 
> Hi,
> 
> upstream is the repository, in this sense your change is upstream. We generally merge fixes into the maintenance branch. Once in a while maint-1.0 is merged into master. To avoid many many merge commits we don't merge after each commit in the maint-1.0 branch.
> 
> So be patient out there, it will get into master at some point.
> 

So when I want to try and test the latest sources then I should use the maintenance branch?

Seems strange to me.

Petr
-- 
Petr Lautrbach
Security Technologies 
Red Hat

Better technology. Faster innovation. Powered by community collaboration.
See how it works at redhat.com.