ndt-dev - Re: [ndt-dev] Re: Merging MultiplePorts branch into master
Subject: NDT-DEV email list created
List archive
- From: Sebastian Kostuch <>
- To: Aaron Brown <>
- Cc: Peter Boothe <>, "" <>
- Subject: Re: [ndt-dev] Re: Merging MultiplePorts branch into master
- Date: Thu, 25 Jun 2015 14:46:27 +0200
Hi Aaron, I haven't look in detail on Peter's changes yet but after a brief look the major critical conflicts will be probably related to connection handling in S2C and C2S tests. When it comes to changes in web100srv file then the one on MultiplePorts are rather small and don't touch critical pieces of code. MultiplePorts branch has been added some months ago and there were few merges being done from master meanwhile (which also provided many conflicts due to major changes in master code) so I think it would be good to first merge these changes and then if needed I could help with resolving conflicts with Peter's changes (they also require some deep review while ours are ready to merge as they are). Protocol changes work ok with or without json usage, actually there are small changes to protocol at this moment as all major features which were discussed in another thread are planned to be implemented later as merging our branch does not require them to be ready for now (I've just added 2 new tests as separated ones and when it comes to protocol they differ from basic throughput tests with additional parameters being sent by server at the beginning of test, which are also contained in json 'msg' value). Regards Sebastian On 25.06.2015 14:22, Aaron Brown wrote:
Hey Sevastian, |
- [ndt-dev] Merging MultiplePorts branch into master, Sebastian Kostuch, 06/24/2015
- Re: [ndt-dev] Merging MultiplePorts branch into master, Peter Boothe, 06/24/2015
- Re: [ndt-dev] Merging MultiplePorts branch into master, Sebastian Kostuch, 06/25/2015
- [ndt-dev] Re: Merging MultiplePorts branch into master, Aaron Brown, 06/25/2015
- Re: [ndt-dev] Re: Merging MultiplePorts branch into master, Sebastian Kostuch, 06/25/2015
- Re: [ndt-dev] Re: Merging MultiplePorts branch into master, Sebastian Kostuch, 06/26/2015
- Re: [ndt-dev] Re: Merging MultiplePorts branch into master, Peter Boothe, 06/29/2015
- Re: [ndt-dev] Re: Merging MultiplePorts branch into master, Sebastian Kostuch, 06/30/2015
- Re: [ndt-dev] Re: Merging MultiplePorts branch into master, Peter Boothe, 06/29/2015
- Re: [ndt-dev] Re: Merging MultiplePorts branch into master, Sebastian Kostuch, 06/26/2015
- Re: [ndt-dev] Re: Merging MultiplePorts branch into master, Sebastian Kostuch, 06/25/2015
- [ndt-dev] Re: Merging MultiplePorts branch into master, Aaron Brown, 06/25/2015
- Re: [ndt-dev] Merging MultiplePorts branch into master, Sebastian Kostuch, 06/25/2015
- Re: [ndt-dev] Merging MultiplePorts branch into master, Peter Boothe, 06/24/2015
Archive powered by MHonArc 2.6.16.