-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/22679/
-----------------------------------------------------------
Review request for cloudstack and daan Hoogland.
Bugs: CLOUDSTACK-6922
https://issues.apache.org/jira/browse/CLOUDSTACK-6922
Repository: cloudstack-git
Description
-------
Resolved review conflicts for CLOUDSTACK-6922
Diffs
-----
api/src/com/cloud/event/EventTypes.java 5c20dbf
api/src/com/cloud/network/firewall/FirewallService.java 5ab7891
api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
579cccb
api/src/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
b09d3a7
api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
4d22772
api/src/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
66dcc03
api/src/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
0795396
api/src/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
f684371
server/src/com/cloud/network/firewall/FirewallManagerImpl.java 4f853b3
server/test/com/cloud/network/MockFirewallManagerImpl.java 3c02613
Diff: https://reviews.apache.org/r/22679/diff/
Testing
-------
Tested on 4.4-forward
Thanks,
Jayapal Reddy
