From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer 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 Message-ID: <1395354507.2938.35.camel@rice-oxley.tremer.info> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5029930590757391302==" List-Id: --===============5029930590757391302== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hey Alf, sorry for my late reply... On Mon, 2014-03-17 at 21:52 +0100, alf(a)i100.no wrote: > Hi >=20 > 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=3Dpeople/ms/ipfire-2.x.git;a=3Dshortlog;h=3Drefs/hea= ds/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). >=20 > 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 --===============5029930590757391302==--