From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: Three outstanding github pull requests, should they be included in 2.15 ?
Date: Thu, 20 Mar 2014 23:28:27 +0100 [thread overview]
Message-ID: <1395354507.2938.35.camel@rice-oxley.tremer.info> (raw)
In-Reply-To: <f290c2cdacc7c5cadbd876702894bdfe.squirrel@webmail.mailadmin.no>
[-- Attachment #1: Type: text/plain, Size: 2241 bytes --]
Hey Alf,
sorry for my late reply...
On Mon, 2014-03-17 at 21:52 +0100, alf(a)i100.no wrote:
> Hi
>
> I now have three outstanding github pull requests, and I am wondering
> if you want to include any of those in the 2.15 release.
I still don't get any email notifications from GitHub so I don't notice
when you send a new pull request. Dunno how to set this up without
getting notification about all other sorts of things.
> The release is approaching, so I understand if you do not want to
> include them (all) in the 2.15.
Indeed we are preparing for the release and therefore no bigger changes
will be accepted into next right now.
> This one I think is the best candidate to be part of 2.15 :
> https://github.com/ipfire/ipfire-2.x/pull/23
> This is just finishing off the changes for using language strings, and
> improving the html code.
This is just some bug fixing, so I merged this one.
> This is updating the version of vnstat, and getting rid of separate
> package for vnstati, which has become part of vnstat.
> https://github.com/ipfire/ipfire-2.x/pull/24
> I am not sure if the pull request is complete, since I do not know
> fully how the build / upgrade works.
This one and the next one are some bigger changes and therefore, I don't
merge them into the 2.15 branch.
However, I am maintaining a beyond-next branch where I collect all
things that people sent me and which will come with the next update
after 2.15.
Part of that are the OpenVPN changes that Erik made for example.
http://git.ipfire.org/?p=people/ms/ipfire-2.x.git;a=shortlog;h=refs/heads/beyond-next
As soon as next is merged into master, beyond-next will be merged into
next.
> This is a new feature :
> https://github.com/ipfire/ipfire-2.x/pull/12
> So maybe this should not be part of 2.15. But I like the new
> functionality, and also like the functionality to see how many blocks
> per interface (red/green/orange/blue).
>
> Let me know what you think, and if you want me to change some of these
> pull requests.
I am very happy about your contributions and please keep them coming.
Even if I cannot merge everything right away, those changes are great
improvements!
-Michael
parent reply other threads:[~2014-03-20 22:28 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <f290c2cdacc7c5cadbd876702894bdfe.squirrel@webmail.mailadmin.no>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395354507.2938.35.camel@rice-oxley.tremer.info \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox