> On Aug. 27, 2013, 7:08 p.m., Sheng Yang wrote: > > Ship It! > > Sheng Yang wrote: > I've pushed to 4.2-forwarding. > > But Dave, could you rebase to master? I cannot apply it clearly on MASTER. > > Also, it's better to use git-format-patch to generated patch. > > Thanks!
Hi Sheng, Sure, I'll prepare a patch for master now. I used to use git-format-patch, but recently I've been using RBTools / post-review. What is the difference between the patches generated by post-review and git-format-patch? If post-review produces diffs we don't like, we can probably remove the recommendation to use it from here: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git Thanks, Dave. - Dave ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/13759/#review25630 ----------------------------------------------------------- On Aug. 23, 2013, 11:31 a.m., Dave Cahill wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/13759/ > ----------------------------------------------------------- > > (Updated Aug. 23, 2013, 11:31 a.m.) > > > Review request for cloudstack and Hugo Trippaers. > > > Bugs: CLOUDSTACK-4466 > > > Repository: cloudstack-git > > > Description > ------- > > Changes in this patch are entirely confined to the MidoNet plugin itself. > > A recent code change in NetworkManager causes NullPointerExceptions when DHCP > capability list is null. > The commit which made the NetworkManager change also changed the > VirtualRouter to not use null for the capabilitylist, but didn't make this > change for other network devices, causing DHCP to fail on MidoNet. > > This change also updates the MidoNet plugin to use the most recent MidoNet > API. > > > Diffs > ----- > > plugins/network-elements/midonet/pom.xml > b393a1a92a451cfb1f64e3a7471a1c82f4b0de3a > > plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java > ab6a6def40558e83b19e870b75182d02bfb0aed0 > > plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java > a6b78d84129d7396dacaeed8888864a860e9a92e > > plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java > d57affc58274229d7e565999bc7a6b2db0c2804e > > plugins/network-elements/midonet/src/com/cloud/network/resource/MidoNetVifDriver.java > 3c7c23d669fdc694d9ab64977d133af3e5e52688 > > plugins/network-elements/midonet/test/com/cloud/network/element/MidoNetElementTest.java > a7d96b0c31050218ef4aa33b44a2a2524c803b17 > > Diff: https://reviews.apache.org/r/13759/diff/ > > > Testing > ------- > > Removed Maven cache (rm -rf ~/.m2/repository) and built successfully, tests > passed. > Spun up several networks and VMs, tested ping to outside, ping VM to VM, > DHCP, Source NAT, Static NAT, Port Forwarding. > > > Thanks, > > Dave Cahill > >