public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* Re: Merge Request for nginx-1.6.2
       [not found] <6fc70257bc00038c7eeaa148a1ede607@beert.de>
@ 2015-01-22 15:30 ` Michael Tremer
  2015-01-24 22:21   ` Merge Request for several git branches Stefan Schantl
  0 siblings, 1 reply; 5+ messages in thread
From: Michael Tremer @ 2015-01-22 15:30 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 681 bytes --]

This is in the "next" branch.

The master branch has already been closed for the release of IPFire 2.17
and only bug fixes go there.

-Michael

On Thu, 2015-01-22 at 16:26 +0100, ben(a)beert.de wrote:
> Hi,
> this is still not in the master branch.. why?
> 
> Ben
> 
> Am 2014-12-29 19:19, schrieb Michael Tremer:
> > Thanks. Merged.
> > 
> > On , Benjamin Schweikert wrote:
> >> Hi,
> >> I updated and tested the nginx package in my nginx git repo. Please
> >> merge to next Core update.
> >> 
> >> Ben
> >> _______________________________________________
> >> Development mailing list
> >> Development(a)lists.ipfire.org
> >> http://lists.ipfire.org/mailman/listinfo/development

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Merge Request for several git branches
  2015-01-22 15:30 ` Merge Request for nginx-1.6.2 Michael Tremer
@ 2015-01-24 22:21   ` Stefan Schantl
  2015-01-29 13:31     ` Michael Tremer
  0 siblings, 1 reply; 5+ messages in thread
From: Stefan Schantl @ 2015-01-24 22:21 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1144 bytes --]

I've put several updates and small bug fixes on my person IPFire 3.x
repository:

* grub2-fix
* dracut-update
* coreutils-update
* util-linux-update
* systemd-215
* sysvinit

Please review them and merge them into the main repository.

-Stefan
> This is in the "next" branch.
> 
> The master branch has already been closed for the release of IPFire 2.17
> and only bug fixes go there.
> 
> -Michael
> 
> On Thu, 2015-01-22 at 16:26 +0100, ben(a)beert.de wrote:
> > Hi,
> > this is still not in the master branch.. why?
> > 
> > Ben
> > 
> > Am 2014-12-29 19:19, schrieb Michael Tremer:
> > > Thanks. Merged.
> > > 
> > > On , Benjamin Schweikert wrote:
> > >> Hi,
> > >> I updated and tested the nginx package in my nginx git repo. Please
> > >> merge to next Core update.
> > >> 
> > >> Ben
> > >> _______________________________________________
> > >> Development mailing list
> > >> Development(a)lists.ipfire.org
> > >> http://lists.ipfire.org/mailman/listinfo/development
> _______________________________________________
> Development mailing list
> Development(a)lists.ipfire.org
> http://lists.ipfire.org/mailman/listinfo/development



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: Merge Request for several git branches
  2015-01-24 22:21   ` Merge Request for several git branches Stefan Schantl
@ 2015-01-29 13:31     ` Michael Tremer
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Tremer @ 2015-01-29 13:31 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 1551 bytes --]

Hi,

I merged all of these. For you as well, please include links to the
branches.

-Michael

On Sat, 2015-01-24 at 23:21 +0100, Stefan Schantl wrote:
> I've put several updates and small bug fixes on my person IPFire 3.x
> repository:
> 
> * grub2-fix
> * dracut-update
> * coreutils-update
> * util-linux-update
> * systemd-215
> * sysvinit
> 
> Please review them and merge them into the main repository.
> 
> -Stefan
> > This is in the "next" branch.
> > 
> > The master branch has already been closed for the release of IPFire 2.17
> > and only bug fixes go there.
> > 
> > -Michael
> > 
> > On Thu, 2015-01-22 at 16:26 +0100, ben(a)beert.de wrote:
> > > Hi,
> > > this is still not in the master branch.. why?
> > > 
> > > Ben
> > > 
> > > Am 2014-12-29 19:19, schrieb Michael Tremer:
> > > > Thanks. Merged.
> > > > 
> > > > On , Benjamin Schweikert wrote:
> > > >> Hi,
> > > >> I updated and tested the nginx package in my nginx git repo. Please
> > > >> merge to next Core update.
> > > >> 
> > > >> Ben
> > > >> _______________________________________________
> > > >> Development mailing list
> > > >> Development(a)lists.ipfire.org
> > > >> http://lists.ipfire.org/mailman/listinfo/development
> > _______________________________________________
> > Development mailing list
> > Development(a)lists.ipfire.org
> > http://lists.ipfire.org/mailman/listinfo/development
> 
> 
> _______________________________________________
> Development mailing list
> Development(a)lists.ipfire.org
> http://lists.ipfire.org/mailman/listinfo/development


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: Merge Request for nginx-1.6.2
  2014-12-28 17:57 Merge Request for nginx-1.6.2 Benjamin Schweikert
@ 2014-12-29 18:19 ` Michael Tremer
  0 siblings, 0 replies; 5+ messages in thread
From: Michael Tremer @ 2014-12-29 18:19 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

Thanks. Merged.

On , Benjamin Schweikert wrote:
> Hi,
> I updated and tested the nginx package in my nginx git repo. Please
> merge to next Core update.
> 
> Ben
> _______________________________________________
> Development mailing list
> Development(a)lists.ipfire.org
> http://lists.ipfire.org/mailman/listinfo/development

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Merge Request for nginx-1.6.2
@ 2014-12-28 17:57 Benjamin Schweikert
  2014-12-29 18:19 ` Michael Tremer
  0 siblings, 1 reply; 5+ messages in thread
From: Benjamin Schweikert @ 2014-12-28 17:57 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 108 bytes --]

Hi,
I updated and tested the nginx package in my nginx git repo. Please merge to next Core update.

Ben

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-01-29 13:31 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <6fc70257bc00038c7eeaa148a1ede607@beert.de>
2015-01-22 15:30 ` Merge Request for nginx-1.6.2 Michael Tremer
2015-01-24 22:21   ` Merge Request for several git branches Stefan Schantl
2015-01-29 13:31     ` Michael Tremer
2014-12-28 17:57 Merge Request for nginx-1.6.2 Benjamin Schweikert
2014-12-29 18:19 ` Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox