{"shas":[["eb8681bc6540744d11fc04f50c68f3be2ac9bf74","b37dd682b63e2654cdbb67e6eade9a2346eb12cd@cloud.com","Merge branch '2.2.10' into 2.2.y\n\nConflicts:\n\tapi/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java","alena"],["b4ffca4256f7e4c0457d10e2596307afd4d59b01","b37dd682b63e2654cdbb67e6eade9a2346eb12cd@cloud.com","Merge branch '2.2.y'\n\nConflicts:\n\tagent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java\n\tapi/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java\n\tapi/src/com/cloud/agent/api/to/FirewallRuleTO.java\n\tapi/src/com/cloud/agent/api/to/IpAddressTO.java\n\tapi/src/com/cloud/agent/api/to/PortForwardingRuleTO.java\n\tapi/src/com/cloud/api/ApiConstants.java\n\tapi/src/com/cloud/api/BaseCmd.java\n\tapi/src/com/cloud/api/ResponseGenerator.java\n\tapi/src/com/cloud/api/commands/CreateFirewallRuleCmd.java\n\tapi/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java\n\tapi/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java\n\tapi/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java\n\tapi/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java\n\tapi/src/com/cloud/api/commands/ListCapabilitiesCmd.java\n\tapi/src/com/cloud/api/commands/UpdateNetworkCmd.java\n\tapi/src/com/cloud/api/response/CapabilitiesResponse.java\n\tapi/src/com/cloud/network/Network.java\n\tapi/src/com/cloud/network/NetworkService.java\n\tapi/src/com/cloud/network/firewall/FirewallService.java\n\tapi/src/com/cloud/network/lb/LoadBalancingRule.java\n\tapi/src/com/cloud/network/lb/LoadBalancingRulesService.java\n\tapi/src/com/cloud/network/rules/FirewallRule.java\n\tapi/src/com/cloud/network/rules/RulesService.java\n\tapi/src/com/cloud/offering/NetworkOffering.java\n\tclient/tomcatconf/commands.properties.in\n\tcloud.spec\n\tcore/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java\n\tcore/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java\n\tcore/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java\n\tcore/src/com/cloud/storage/template/DownloadManagerImpl.java\n\tcore/src/com/cloud/vm/DomainRouterVO.java\n\tdebian/cloud-deps.install\n\tpatches/systemvm/debian/config/etc/init.d/cloud-early-config\n\tpatches/systemvm/debian/config/root/ipassoc.sh\n\tpatches/systemvm/debian/config/root/loadbalancer.sh\n\tscripts/vm/hypervisor/kvm/rundomrpre.sh\n\tscripts/vm/hypervisor/xenserver/vmops\n\tserver/src/com/cloud/agent/manager/AgentAttache.java\n\tserver/src/com/cloud/agent/manager/AgentManagerImpl.java\n\tserver/src/com/cloud/agent/manager/AgentMonitor.java\n\tserver/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java\n\tserver/src/com/cloud/alert/ClusterAlertAdapter.java\n\tserver/src/com/cloud/api/ApiResponseHelper.java\n\tserver/src/com/cloud/api/ApiServer.java\n\tserver/src/com/cloud/cluster/ClusterManagerImpl.java\n\tserver/src/com/cloud/configuration/Config.java\n\tserver/src/com/cloud/configuration/ConfigurationManager.java\n\tserver/src/com/cloud/configuration/ConfigurationManagerImpl.java\n\tserver/src/com/cloud/configuration/DefaultComponentLibrary.java\n\tserver/src/com/cloud/deploy/FirstFitPlanner.java\n\tserver/src/com/cloud/ha/HighAvailabilityManagerImpl.java\n\tserver/src/com/cloud/host/dao/HostDaoImpl.java\n\tserver/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java\n\tserver/src/com/cloud/network/LoadBalancerVO.java\n\tserver/src/com/cloud/network/NetworkManager.java\n\tserver/src/com/cloud/network/NetworkManagerImpl.java\n\tserver/src/com/cloud/network/dao/FirewallRulesDao.java\n\tserver/src/com/cloud/network/dao/FirewallRulesDaoImpl.java\n\tserver/src/com/cloud/network/element/DhcpElement.java\n\tserver/src/com/cloud/network/element/VirtualRouterElement.java\n\tserver/src/com/cloud/network/firewall/FirewallManagerImpl.java\n\tserver/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java\n\tserver/src/com/cloud/network/router/VirtualNetworkApplianceManager.java\n\tserver/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java\n\tserver/src/com/cloud/network/rules/FirewallManager.java\n\tserver/src/com/cloud/network/rules/FirewallRuleVO.java\n\tserver/src/com/cloud/network/rules/PortForwardingRuleVO.java\n\tserver/src/com/cloud/network/rules/RulesManagerImpl.java\n\tserver/src/com/cloud/network/rules/StaticNatRuleImpl.java\n\tserver/src/com/cloud/network/security/SecurityGroupListener.java\n\tserver/src/com/cloud/network/security/SecurityGroupManagerImpl.java\n\tserver/src/com/cloud/offerings/NetworkOfferingVO.java\n\tserver/src/com/cloud/server/ConfigurationServerImpl.java\n\tserver/src/com/cloud/server/ManagementServerImpl.java\n\tserver/src/com/cloud/storage/StorageManager.java\n\tserver/src/com/cloud/storage/StorageManagerImpl.java\n\tserver/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java\n\tserver/src/com/cloud/storage/download/DownloadMonitorImpl.java\n\tserver/src/com/cloud/upgrade/DatabaseUpgradeChecker.java\n\tserver/src/com/cloud/upgrade/dao/Upgrade228to229.java\n\tserver/src/com/cloud/upgrade/dao/Upgrade229to2210.java\n\tserver/src/com/cloud/user/AccountManagerImpl.java\n\tserver/src/com/cloud/vm/UserVmManagerImpl.java\n\tserver/src/com/cloud/vm/VirtualMachineManagerImpl.java\n\tserver/src/com/cloud/vm/dao/DomainRouterDao.java\n\tserver/src/com/cloud/vm/dao/DomainRouterDaoImpl.java\n\tsetup/db/create-index-fk.sql\n\tsetup/db/create-schema.sql\n\tsetup/db/db/schema-222to224.sql\n\tsetup/db/db/schema-227to228.sql\n\tsetup/db/db/schema-228to229.sql\n\tsetup/db/db/schema-229to2210.sql\n\ttools/testClient/README\n\tui/scripts/cloud.core.instance.js\n\tutils/src/com/cloud/utils/SerialVersionUID.java\n\tutils/src/com/cloud/utils/db/ConnectionConcierge.java\n\tutils/src/com/cloud/utils/db/Merovingian2.java\n\tutils/src/com/cloud/utils/db/Transaction.java\n\tutils/src/com/cloud/utils/nio/Link.java\n\tutils/src/com/cloud/utils/nio/NioConnection.java\n\tutils/src/com/cloud/utils/time/InaccurateClock.java","alena"]],"ref":"refs/heads/master","size":2,"head":"b4ffca4256f7e4c0457d10e2596307afd4d59b01","push_id":40343791}