yes, those are both the same fix. One is targeting the 4.4 branch for Daan to merge. The other is targeting the master branch...
as for the tests, I can look into travis. where is this .travis.yml you speak of? is there docs anywhere on this? I did real tests on an actual environment with my own script/test framework to make sure everything is functional and works as expected. ws *Will STEVENS* Lead Developer *CloudOps* *| *Cloud Solutions Experts 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6 w cloudops.com *|* tw @CloudOps_ On Thu, Sep 4, 2014 at 1:23 PM, sebgoa <run...@gmail.com> wrote: > > On Sep 4, 2014, at 7:17 PM, Will Stevens <wstev...@cloudops.com> wrote: > > > Following up on this... > > > > Who should I be asking to merge this into master? Should I just be > pushing > > my changes directly into master? I thought we wanted features and fixes > to > > go through the RM for the release, is this not the case. > > > > I have the following fixes waiting for commit: > > CLOUDSTACK-7468: > > https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=5d11385 > > CLOUDSTACK-7418: > > https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=18653f6 > > > > Let me know if I should just be pushing these directly into master… > > > > Hi Will, > > So I see two branches from you hotfix/4.4-7418 and CLOUDSTACK-7418 > > Are these the same fix, did you mean to do this ? > > Technically you can push to master yourself without asking. > > Ideally :) the build on your hot fix branch should be green with test > passing and with additional integration tests (assuming they could run with > the simulator). > > Check: > > https://travis-ci.org/apache/cloudstack/builds > > If you could spend some time checking the .travis.yml file and > understanding how it runs the test you could help with making it green :) > > -sebastien > > > Cheers, > > > > Will > > > > > > > > *Will STEVENS* > > Lead Developer > > > > *CloudOps* *| *Cloud Solutions Experts > > 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6 > > w cloudops.com *|* tw @CloudOps_ > > > > > > On Wed, Sep 3, 2014 at 3:02 PM, Will Stevens <wstev...@cloudops.com> > wrote: > > > >> Here is a link to the issue: > >> https://issues.apache.org/jira/browse/CLOUDSTACK-7468 > >> > >> This fix has been committed in the 4.4 branch already. I have pushed a > >> feature branch called 'CLOUDSTACK-7468' to the ASF repo which is a > branch > >> off master with the fix applied. The fix for master is here: > >> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=5d11385 > >> > >> I am not sure how the release manager is for 4.5, but can someone please > >> review and commit the fix into master? > >> > >> Thanks, > >> > >> *Will STEVENS* > >> Lead Developer > >> > >> *CloudOps* *| *Cloud Solutions Experts > >> 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6 > >> w cloudops.com *|* tw @CloudOps_ > >> > >> > >
