I don't think I was clear. I don't need a new patch. I did resolve the conflict. I need you to check if I did the right thing in branch 4.4 in EventTypes near line 550
your new patch doesn't apply to 4.4 or 4.4-forward > git am -s > ~/Downloads/0001-CLOUDSTACK-6922-Updated-events-for-firewall-ingress-.patch Applying: CLOUDSTACK-6922: Updated events for firewall ingress and egress error: patch failed: api/src/com/cloud/event/EventTypes.java:126 error: api/src/com/cloud/event/EventTypes.java: patch does not apply error: patch failed: api/src/com/cloud/network/firewall/FirewallService.java:40 error: api/src/com/cloud/network/firewall/FirewallService.java: patch does not apply error: patch failed: api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java:154 error: api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java: patch does not apply error: patch failed: api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java:134 error: api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java: patch does not apply error: patch failed: api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java:74 error: api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java: patch does not apply error: patch failed: api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java:96 error: api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java: patch does not apply error: patch failed: api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java:78 error: api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java: patch does not apply error: patch failed: api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java:79 error: api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java: patch does not apply error: patch failed: server/src/com/cloud/network/firewall/FirewallManagerImpl.java:161 error: server/src/com/cloud/network/firewall/FirewallManagerImpl.java: patch does not apply error: patch failed: server/test/com/cloud/network/MockFirewallManagerImpl.java:70 error: server/test/com/cloud/network/MockFirewallManagerImpl.java: patch does not apply Patch failed at 0001 CLOUDSTACK-6922: Updated events for firewall ingress and egress On Tue, Jun 17, 2014 at 1:41 PM, Jayapal Reddy Uradi <jayapalreddy.ur...@citrix.com> wrote: > Hi Daan, > > Resolved the conflicts and uploaded patch in review board. > https://reviews.apache.org/r/22679/ > > Thanks, > Jayapal > > On 17-Jun-2014, at 4:52 PM, Daan Hoogland <daan.hoogl...@gmail.com> > wrote: > >> On Tue, Jun 17, 2014 at 8:41 AM, Jayapal Reddy Uradi >> <jayapalreddy.ur...@citrix.com> wrote: >>> 2214bd2502a34ee8e671eb6b4efe8cd26e29ac5a >> >> >> I had conflicts. Can you have a look near line 550? I resolved by >> changing IpAddress to PublicIpAddress. >> >> regards >> -- >> Daan > -- Daan
