[Container-tools] Start merging atomicapp features to master!

[Aaron Weitekamp]

Per Jez Humble [1] I would recommend PRs merge to master and direct users
to stable releases.

[1]
http://continuousdelivery.com/2011/07/on-dvcs-continuous-integration-and-feature-branches/

On Mon, Mar 7, 2016 at 10:15 AM, Charlie Drage <cdrage at redhat.com> wrote:

> I'm fine with feature branches. But not dev/master workflow. We need
> to stick to the github style workflow as that is what the majority of
> OSS contributors use.
>
> But no problem by me. If you want to play with experimental features
> feel free to create a branch and create PR's that merge to it.
>
> As long as it's a feature branch I believe we can bypass the formality
> of having to have two maintainers :+1: or LGTM the PR's to them.
>
> In regards to new features, we'll merge them to master post-1.0.0, just
> one more
> week (let's try not to jinx it, haha)! Until then, feel free to create
> a feature branch.
>
> In regards to the issues, there's quite a few which have been opened
> recently, if any of the new hires would like help tackling them don't
> be afraid to ask. Personally, I'm still overwhelmed by docs, but
> I'll be focusing back on coding soon and closing some issues.
>
> On 03/04, Ratnadeep Debnath wrote:
> > Hi all,
> >
> > I think it's time we should start merging pending feature pull
> > requests to master branch of atomicapp and start closing issues. If
> > needed, we can cut out a branch for the upcoming stable release and
> > cherry pick changes into the release branch.
> >
> > Thanks,
> > rtnpro
> > --
> > Ratnadeep Debnath,
> > https://www.waartaa.com
> > GPG Fingerprint: 033C 8041 A0E9 CDBA 2E02  B785 2119 5486 F245 DFD6
> >
> > _______________________________________________
> > Container-tools mailing list
> > Container-tools at redhat.com
> > https://www.redhat.com/mailman/listinfo/container-tools
>
> --
>
> Charlie Drage
> Red Hat - OSAS Team / Project Atomic
> 4096R / 0x9B3B446C
> http://pgp.mit.edu/pks/lookup?op=get&search=0x622CDF119B3B446C
>
> _______________________________________________
> Container-tools mailing list
> Container-tools at redhat.com
> https://www.redhat.com/mailman/listinfo/container-tools
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/container-tools/attachments/20160307/a3daa7b0/attachment.htm>