cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daan Hoogland <d...@onecht.net>
Subject Re: CloudPlatform - Target: ccp-4.5_greenfield - BUILD # 331 - RESULT: Successful
Date Fri, 23 Jan 2015 16:51:54 GMT
very nice surprise, can someone explain what I am looking at?

On 23/01/15 12:17, jenkins-ccp@citrix.com wrote:
> CloudPlatform_4.x_Plus_Builds_Job2
> 	*BUILD SUCCESS*
> Build URL 
> http://jenkins-ccp.citrix.com/job/CloudPlatform_4.x_Plus_Builds_Job2/331/
> Project: 	CloudPlatform_4.x_Plus_Builds_Job2
> Target: 	
> Package: 	
> Date of build: 	Fri, 23 Jan 2015 02:59:26 -0800
> Build duration: 	17 min
> Build cause: 	Started by user rajkumart
> Build description: 	
> Built on: 	master
>
>
>   Health Report
>
> W 	Description 	Score
> 	Build stability: No recent builds failed. 	100
>
>
>   Changes
>
> <http://jenkins-ccp.citrix.com/job/CloudPlatform_4.x_Plus_Builds_Job2/331//changes> 
>
>
>
>     Revert "CLOUDSTACK-6278"
>
> by /david/
>
>   edit 	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
>
>
>     cleaning up some from a revert
>
> by /david/
>
>   edit 
> plugins/hypervisors/baremetal/resources/META-INF/cloudstack/core/spring-baremetal-core-context.xml 
>
>   edit 	utils/src/com/cloud/utils/xmlobject/XmlObjectParser.java
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/Force10BaremetalSwitchBackend.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java 
>
>   edit 	systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java 
>
>   edit 	scripts/network/ping/prepare_pxe.sh
>   edit 	utils/src/com/cloud/utils/xmlobject/XmlObject.java
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java 
>
>   edit 	scripts/network/ping/baremetal_snat.sh
>   edit 	utils/test/com/cloud/utils/xmlobject/TestXmlObject.java
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java 
>
>
>
>     more revert cleanup
>
> by /david/
>
>   delete 
> plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/BaremetalProvisionDoneNotificationCmd.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java 
>
>   edit 	server/src/com/cloud/configuration/Config.java
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java 
>
>   edit 	api/src/com/cloud/event/EventTypes.java
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>     CLOUDSTACK-7561: UI: After creating a new account, the "Add
>     Account" dialog remains open
>
> by /david/
>
>   edit 	ui/scripts/accountsWizard.js
>
>
>     CLOUDSTACK-7562: Details page for disk offerings only show details
>     for write performance
>
> by /david/
>
>   edit 	ui/scripts/configuration.js
>
>
>     CLOUDSTACK-7587 - Automation - Add simulator_only attribute to acl
>     related test cases.
>
> by /david/
>
>   edit 	test/integration/component/test_acl_sharednetwork.py
>   edit 	test/integration/component/test_acl_isolatednetwork_delete.py
>   edit 	test/integration/component/test_acl_listvolume.py
>   edit 	test/integration/component/test_acl_listvm.py
>   edit 	test/integration/component/test_acl_isolatednetwork.py
>   edit 
> test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py 
>
>   edit 	test/integration/component/test_acl_listsnapshot.py
>
>
>     CLOUDSTACK-7588: [Vmware] Creating templates (with same names)
>     from volumes  get deleted from CS. Fix it by changing the unique
>     name generation to the standard one used by registertemplate. Also
>     cleaned up vmtemplatevo which had too many constructors.
>
> by /david/
>
>   edit 	engine/schema/src/com/cloud/storage/VMTemplateVO.java
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>
>
>     IOPS null issue CLOUDSTACK-7570
>
> by /david/
>
>   edit 	engine/schema/src/com/cloud/service/ServiceOfferingVO.java
>   edit 	engine/schema/src/com/cloud/storage/DiskOfferingVO.java
>
>
>     CLOUDSTACK-7589: VM not Starting and always stuck in Stopped state
>     after
>
> by /david/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManagerImpl.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/SyncQueueManager.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     CLOUDSTACK-7494. Migration of a vm fails on Hyper-V. In an earlier
>     commit as part of
>
> by /david/
>
>   edit 
> plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs 
>
>
>
>     CLOUDSTACK-7579 Adding a method to base.py to update storage pool
>
> by /david/
>
>   edit 	tools/marvin/marvin/lib/base.py
>
>
>     In case of Hyper-v ssvm/cpvm reboot takes time so made changes to
>     handle this
>
> by /david/
>
>   edit 	tools/marvin/marvin/lib/utils.py
>
>
>     CLOUDSTACK-7595: Config parameters "job.expire.minutes" and
>     "job.cancel.threshold.minutes" incorrectly getting multiplied by a
>     factor of 60
>
> by /david/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>   edit 	server/src/com/cloud/configuration/Config.java
>
>
>     Creating custom disk does not work as expected
>
> by /david/
>
>   edit 	test/integration/component/test_escalations_volumes.py
>   edit 	tools/marvin/marvin/lib/base.py
>
>
>     CLOUDSTACK-6603 [Upgrade]DB Exception while Autoscale monitoring
>     after upgrading from 4.3 to 4.4
>
> by /david/
>
>   edit 	setup/db/db/schema-40to410.sql
>   edit 	setup/db/db/schema-430to440.sql
>
>
>     CLOUDSTACK-6172: Adding new test case to verify this fix
>
> by /david/
>
>   edit 	test/integration/component/test_volumes.py
>
>
>     timeInSeconds * 1000
>
> by /david/
>
>   edit 	framework/db/src/com/cloud/utils/db/Merovingian2.java
>
>
>     cleaning up more conflicts
>
> by /david/
>
>   edit 	framework/db/src/com/cloud/utils/db/Merovingian2.java
>
>
>     CLOUDSTACK-7625: UI > IP Address page > EnableVPN > If
>     createRemoteAccessVpn returns success, but the newly created
>     remoteaccessvpn object's state is not Running, treat it as a failure.
>
> by /david/
>
>   edit 	ui/scripts/network.js
>
>
>     CLOUDSTACK-7628:VM Worker job should be expunged one hour after
>
> by /david/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java 
>
>
>
>     CLOUDSTACK-7622: Fixed deleting network when provider is disable
>
> by /david/
>
>   edit 
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java 
>
>
>
>     CLOUDSTACK-7555 - Fixed the test_usage script - Template now
>     belongs to the Regular Account to test TEMPLATE.CREATE Event
>
> by /david/
>
>   edit 	test/integration/component/test_usage.py
>
>
>     CLOUDSTACK-7598: When a vm deployed by cloudstack is stopped on
>     the hypervisor
>
> by /david/
>
>   edit 
> engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
>
>
>     CLOUDSTACK-7631: Log rotate on VR may fail as /etc/init.d/rsyslog
>     does not anymore support reload option on debian wheezy
>
> by /david/
>
>   edit 	systemvm/patches/debian/config/etc/logrotate.d/rsyslog
>
>
>     CID-1223274: Remove dead local storage code from VolumeApiServiceImpl
>
> by /david/
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>
>
>     XenServer56FP1Resource: remove unused import
>
> by /david/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java 
>
>
>
>     CID-1192798: Remove unused boolean variable
>
> by /david/
>
>   edit 
> api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
>
>
>     CID-1211005: Fix comparison, Class<?> is always instance of Class
>
> by /david/
>
>   edit 	server/src/com/cloud/event/ActionEventUtils.java
>
>
>     CID-1192810: Remove useless control flow
>
> by /david/
>
>   edit 	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
>
>
>     CID-1192822: ids is a List<Long>, the cast to List<?> is removed
>
> by /david/
>
>   edit 	server/src/com/cloud/api/query/QueryManagerImpl.java
>
>
>     CID-1223272: Remove DLS code, exceptions and logging handled at
>     lower layers
>
> by /david/
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java 
>
>
>
>     CLOUDSTACK-7633: fix "Provides" in most LSB headers
>
> by /david/
>
>   edit 	agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
>   edit 	usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in
>   edit 	usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in
>   edit 	python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in
>   edit 	usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in
>   edit 	python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
>   edit 	packaging/debian/init/cloud-agent
>   edit 	packaging/debian/init/cloud-usage
>   edit 	agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in
>   edit 	usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in
>   edit 	agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in
>   edit 	usage/distro/opensuse/SYSCONFDIR/init.d/cloud-usage.in
>   edit 	packaging/centos63/cloud-usage.rc
>   edit 	usage/distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in
>
>
>     CID-1222206: Remove DLS from XenServer56FP1Resource
>
> by /david/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java 
>
>
>
>     CID-1232342: Fix DLS in createOrUpdateRecord in GloboDnsResource
>
> by /david/
>
>   edit 
> plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java 
>
>
>
>     CLOUDSTACK-7634: UI > Project Dropdown on top menu > not all
>     projects are populated when there are more than 500 projects in
>     database.
>
> by /david/
>
>   edit 	ui/scripts/projects.js
>
>
>     Fixed Encoding issue to message_ja_JP & message_zh_CN properties
>     files.
>
> by /david/
>
>   edit 	client/WEB-INF/classes/resources/messages_ja_JP.properties
>   edit 	client/WEB-INF/classes/resources/messages_zh_CN.properties
>
>
>     CLOUDSTACK-7617: Removed hard coded VM names and skipped test
>     cases according to the hypervisor support
>
> by /david/
>
>   edit 	test/integration/component/test_custom_hostname.py
>
>
>     List ISO's test to verify default ISO's are listed always
>
> by /david/
>
>   edit 	test/integration/smoke/test_iso.py
>
>
>     CLOUDSTACK-7495. Volume resize is only supported on kvm, vmware
>     and xenserver. If
>
> by /david/
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>   edit 
> api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java 
>
>
>
>     CLOUDSTACK-7575: improved performance of cleanString method in
>     StringUtils
>
> by /david/
>
>   edit 	utils/src/com/cloud/utils/StringUtils.java
>
>
>     CLOUDSTACK-7610,CLOUDSTACK-7611,CLOUDSTACK-7612: Fixed following
>     bugs in AlertsSyslogAppender 1. Added sync alert. 2. Changed
>     unrecognised alerts are send as unknown instead of null. 3. Added
>     unit tests to cover some more scenarios.
>
> by /david/
>
>   edit 
> plugins/alert-handlers/syslog-alerts/src/org/apache/cloudstack/syslog/AlertsSyslogAppender.java 
>
>   edit 
> plugins/alert-handlers/syslog-alerts/test/org/apache/cloudstack/syslog/AlertsSyslogAppenderTest.java 
>
>
>
>     CLOUDSTACK-7499: Adding test cases for VMLC test path
>
> by /david/
>
>   add 	test/integration/testpaths/__init__.py
>   edit 	tools/marvin/marvin/config/test_data.py
>   add 	test/integration/testpaths/testpath_vmlc.py
>   edit 	tools/marvin/marvin/lib/base.py
>
>
>     CLOUDSTACK-7603: Fixed test_escalations_network.py - test suite
>     should use its own vpc offering
>
> by /david/
>
>   edit 	test/integration/component/test_escalations_networks.py
>
>
>     CLOUDSTACK-7616: Fixed test_escalations_ipaddress.py - test suite
>     should use its own vpc offering
>
> by /david/
>
>   edit 	test/integration/component/test_escalations_ipaddresses.py
>
>
>     Test script to verify vm deployment with two networks in SG
>     enabled advanced zone
>
> by /david/
>
>   edit 	tools/marvin/marvin/config/test_data.py
>   edit 	test/integration/component/test_advancedsg_networks.py
>
>
>     CLOUDSTACK-7408: Fixed - Private key of the ssh keypair was
>     getting corrupted
>
> by /david/
>
>   edit 	tools/marvin/marvin/lib/base.py
>   edit 	tools/marvin/marvin/sshClient.py
>   edit 	tools/marvin/marvin/lib/utils.py
>
>
>     Additional Guest OS support for vGPU Test Automation
>
> by /david/
>
>   edit 	test/integration/component/test_deploy_vgpu_vm.py
>   edit 	tools/marvin/marvin/config/test_data.py
>
>
>     CLOUDSTACK-7637: UI > fix a bug produced by 4.5 feature "template
>     accross multiple zones" > fix it by including all properties to
>     jsonObj.
>
> by /david/
>
>   edit 	ui/scripts/templates.js
>
>
>     CLOUDSTACK-7641: Do not always ask libvirt to refresh a storage pool
>
> by /david/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/StorageAdaptor.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/IscsiAdmStorageAdaptor.java 
>
>
>
>     CLOUDSTACK-7373: Incorrect Japanese keyboard mapping with CentOS
>     CLI and windows guestOS on VMware.
>
> by /david/
>
>   edit 	systemvm/js/ajaxkeys.js
>   edit 	systemvm/js/ajaxviewer.js
>
>
>     CLOUDSTACK-7615: Update log msg to print error msg rather than
>     exception
>
> by /david/
>
>   edit 	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
>
>
>       cloudmanagementserver.keystore is corrupted by
>     ant.filters.ReplaceTokens,
>
> by /david/
>
>   add 	client/tomcatconf/cloudmanagementserver.keystore
>   edit 	client/pom.xml
>   delete 	client/tomcatconf/cloudmanagementserver.keystore.in
>
>
>     CLOUDSTACK-7647: Fix 'isReverse' checkboxes which are checked by
>     default
>
> by /david/
>
>   edit 	ui/scripts/ui/dialog.js
>
>
>     BUG-ID: CLOUDSTACK-7652. [VMware] 'SOAPFaultException: The object
>     has already been deleted or has not been completely created'
>     exceptions.
>
> by /david/
>
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java 
>
>
>
>     BUG-ID: CLOUDSTACK-7653. VM's are not getting deleted from
>     hypervisor after deleting from UI when using zone wide primary
>     storage.
>
> by /david/
>
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java 
>
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java 
>
>   edit 
> plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java 
>
>   edit 
> engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/StorageAction.java 
>
>
>
>     CLOUDSTACK-7197: Added new system template DB changes in 4.5
>     upgrade. Removed 4.3 DB upgrade code for system template
>
> by /david/
>
>   edit 	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
>   edit 	engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
>
>
>     when system VM ping times out, stop system VM
>
> by /david/
>
>   edit 
> server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java
>   edit 	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
>   edit 
> server/src/com/cloud/storage/secondary/SecondaryStorageListener.java
>   edit 
> engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
>   edit 
> services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java 
>
>
>
>     Revert "CLOUDSTACK-7647: Fix 'isReverse' checkboxes which are
>     checked by default"
>
> by /david/
>
>   edit 	ui/scripts/ui/dialog.js
>
>
>     add guest OS Centos 7 and Oracle Linux 7
>
> by /david/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     Undo "Revert "CLOUDSTACK-7647"
>
> by /david/
>
>   edit 	ui/scripts/ui/dialog.js
>
>
>     speed up template download: don't sync io for each write
>
> by /david/
>
>   edit 	core/src/com/cloud/storage/template/HttpTemplateDownloader.java
>
>
>     fix checkstyle
>
> by /david/
>
>   edit 	core/src/com/cloud/storage/template/HttpTemplateDownloader.java
>
>
>     CLOUDSTACK-7657: cloud.log is being rotated by multiple rotation
>     policies on SSVM and CPVM
>
> by /david/
>
>   edit 	systemvm/patches/debian/config/etc/init.d/cloud-early-config
>
>
>     For network stats aggregation job, get the most recent mgmt server
>     id to do the aggregation. Set dao filter to descending.
>
> by /david/
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>     CLOUDSTACK-6969. Data Volume Shrink operation failing with
>     "Unexpected Exception".
>
> by /david/
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>
>
>     BUG-ID: CLOUDSTACK-7662. Resize of detached volume fails.
>
> by /david/
>
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java 
>
>
>
>     CLOUDSTACK-7663: Fix typo in response name string: there is an
>     extra 's'
>
> by /david/
>
>   edit 
> api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java 
>
>
>
>     CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
>
> by /david/
>
>   edit 	core/src/com/cloud/agent/api/StartupRoutingCommand.java
>   edit 	engine/schema/src/com/cloud/host/dao/HostTagsDao.java
>   edit 	server/src/com/cloud/deploy/FirstFitPlanner.java
>   edit 	setup/db/db/schema-441to450.sql
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>   add 	server/test/com/cloud/vm/FirstFitPlannerTest.java
>   edit 	server/src/com/cloud/configuration/Config.java
>   edit 	server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer620SP1Resource.java 
>
>   edit 
> plugins/deployment-planners/implicit-dedication/test/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java 
>
>   edit 	engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java
>
>
>     CLOUDSTACK-7664: [UI] Handle change in API response for
>     listloadbalancer
>
> by /david/
>
>   edit 	ui/scripts/vpc.js
>
>
>     added more log for create vm snapshot
>
> by /david/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>
>
>     cleaning more conflicts
>
> by /david/
>
>   edit 	setup/db/db/schema-440to441.sql
>   edit 
> framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java 
>
>
>
>     CLOUDSTACK-7665 File.separator shouldn't be used in this case, the
>
> by /david/
>
>   edit 
> engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java 
>
>
>
>     Move the PrepareKickstartPxeServerCommand to the core api so other
>
> by /david/
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java 
>
>   delete 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java 
>
>   add 
> core/src/com/cloud/agent/api/baremetal/PrepareKickstartPxeServerCommand.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java 
>
>
>
>     CLOUDSTACK-7645: [UI] Fixing incorrect labels, including instances
>     of "???label.*???"
>
> by /david/
>
>   edit 	ui/scripts/storage.js
>   edit 	ui/dictionary.jsp
>   edit 	ui/scripts/configuration.js
>   edit 	ui/scripts/ui-custom/physicalResources.js
>   edit 	ui/scripts/templates.js
>   edit 	ui/dictionary2.jsp
>   edit 	client/WEB-INF/classes/resources/messages.properties
>
>
>     Remove adding implicit tags in DB schema so that management server
>     starts, original commit 39fe766c2b6fb6edd4c1 needs review
>
> by /david/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     Revert "Remove adding implicit tags in DB schema so that
>     management server starts, original commit 39fe766c2b6fb6edd4c1
>     needs review"
>
> by /david/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     CLOUDSTACK-7668: UI > When UI is loaded the first time, sometimes
>     a blank screen instead of a login screen shows. Only after
>     clicking Refresh button(i.e. loaded again) will the login screen show.
>
> by /david/
>
>   edit 	ui/scripts/cloudStack.js
>
>
>     ccp should not check public ip resource when deploy a vm on shared
>     network
>
> by /david/
>
>   edit 	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
>   edit 	server/src/com/cloud/network/IpAddressManagerImpl.java
>
>
>     CLOUDSTACK-7668: UI > When UI is loaded the first time, sometimes
>     a blank screen instead of a login screen shows > fix it by
>     declaring the variables beforehand.
>
> by /david/
>
>   edit 	ui/scripts/sharedFunctions.js
>
>
>     Revert "CLOUDSTACK-7533: Wrong download URL is generated when
>     using multiple SSVMs in a zone. The public ip of the url would
>     sometime point to the wrong ssvm when the url was created on
>     another one."
>
> by /david/
>
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
>
>
>     CLOUDSTACK-6478:Fix a typo in RemoteHostEndPoint.setId().
>
> by /david/
>
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java
>
>
>     CLOUDSTACK-6282-Added hyper-v hypervisor checks for automated tests
>
> by /david/
>
>   edit 	test/integration/component/test_escalations_templates.py
>   edit 	test/integration/component/test_escalations_isos.py
>   edit 	test/integration/component/test_escalations_volumes.py
>   edit 	test/integration/component/test_escalations_ipaddresses.py
>   edit 	test/integration/component/test_escalations_snapshots.py
>   edit 	test/integration/component/test_escalations_networks.py
>   edit 	test/integration/component/test_escalations_instances.py
>
>
>     Fixed few coverity issues
>
> by /david/
>
>   edit 	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>
>
>     CLOUDSTACK-7654 fixed issues with zip format templates.
>
> by /david/
>
>   edit 	scripts/storage/qcow2/createtmplt.sh
>   edit 	scripts/installer/createtmplt.sh
>   edit 	scripts/storage/secondary/createtmplt.sh
>
>
>     CLOUDSTACK-7671: Management server restart failed after reboot
>
> by /david/
>
>   add 	packaging/centos63/rhel7/cloudstack-management.conf
>   edit 	packaging/centos63/default/macros.spec
>   edit 	packaging/centos63/rhel7/macros.spec
>   edit 	packaging/centos63/cloud.spec
>
>
>     CLOUDSTACK-7679: bump up the RabbitMQ AMQP java client version from
>
> by /david/
>
>   edit 	plugins/event-bus/rabbitmq/pom.xml
>
>
>     CLOUDSTACK-7680:Adding kwargs to volume.upload in base.py
>
> by /david/
>
>   edit 	tools/marvin/marvin/lib/base.py
>
>
>     CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
>
> by /david/
>
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>
>
>     CLOUDSTACK-7649: test_lb_secondary_ip.py - Removed SSH trying step
>     after Destroying and Recovering VM because secondary IP
>     information does not retain on VM after destroying it and SSH will
>     not be successful in that case
>
> by /david/
>
>   edit 	test/integration/component/test_lb_secondary_ip.py
>
>
>     CLOUDSTACK-7644: test_persistent_networks.py - SSH failure in case
>     of LB rule due to port mismatch
>
> by /david/
>
>   edit 	test/integration/component/test_persistent_networks.py
>
>
>     CLOUDSTACK-7646: test_nuage_vsp.py - Fixed basic indentation
>     issues, list index issues, marked it as invalid because the test
>     cases needs attention by the original author as it does not pass
>     even after fixing the issues. Also moving it to smoke folder as
>     clearly it is a Basic Validation test
>
> by /david/
>
>   add 	test/integration/smoke/test_nuage_vsp.py
>   delete 	test/integration/component/test_nuage_vsp.py
>
>
>     CLOUDSTACK-7681: UI > zone wizard > Advanced zone > hypervisor =>
>     do not support BareMetal
>
> by /david/
>
>   edit 	ui/scripts/zoneWizard.js
>
>
>     CLOUDSTACK-7661: VM wizard: Add keyboard language dropdown
>
> by /david/
>
>   edit 	ui/index.jsp
>
>
>     Revert "CLOUDSTACK-7671: Management server restart failed after
>     reboot"
>
> by /david/
>
>   edit 	packaging/centos63/rhel7/macros.spec
>   edit 	packaging/centos63/default/macros.spec
>   edit 	packaging/centos63/cloud.spec
>   delete 	packaging/centos63/rhel7/cloudstack-management.conf
>
>
>     CLOUDSTACK-4987: UI > Instances > detailView > NICs tab > Add
>     network to VM > Network dropdown => (1) For root-admin, populate
>     networks of all accounts. (2) For regular-user/domain-admin,
>     populate only networks belonging to this VM owner.
>
> by /david/
>
>   edit 	ui/scripts/instances.js
>
>
>     CLOUDSTACK-3195: UI > IP Address > detailView > Configuration tab
>     > Port Forwarding > for regular-user, if underlying VM has been
>     destroyed (i.e. listVirtualMachines API returns nothing), compose
>     vm object from limited vm data in port forwarding rule object. So,
>     a vm object (required in widget code) can be passed to widget code.
>
> by /david/
>
>   edit 	ui/scripts/network.js
>
>
>     CLOUDSTACK-7632:Automation for volume life cycle testPath
>
> by /david/
>
>   add 	test/integration/testpaths/testpath_volumelifecycle.py
>
>
>     CLOUDSTACK:7323: [vGPU] Creation of VM snapshot with "memory" is
>     failing.
>
> by /david/
>
>   edit 	server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java
>   edit 	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
>   edit 	ui/scripts/instances.js
>
>
>     updated packge scripts to support simularot rpm build
>
> by /david/
>
>   edit 	packaging/centos63/package.sh
>   edit 	packaging/centos63/cloud.spec
>
>
>     CLOUDSTACK-7661: UI > VM Wizard > Keyboard Language > send new
>     parameter keyboard to deployVirtualMachine API call.
>
> by /david/
>
>   edit 	ui/scripts/instanceWizard.js
>
>
>     CLOUDSTACK-5359: UI > Infrastructure > Clusters > Add Cluster >
>     Public Traffic vSwitch Type field, Guest Traffic vSwitch Type
>     field > do not pass the value of the form field to API call when
>     the the form field is not displaying.
>
> by /david/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-2625, CLOUDSTACK-3401: Usage records are ordered by
>     start_date which is not unique. While listing large datasets or
>     when page size is small this will result in duplicates. Order
>     records by id instead
>
> by /david/
>
>   edit 	server/src/com/cloud/usage/UsageServiceImpl.java
>
>
>     CLOUDSTACK-5719: UI > Network > Add Guest Network > when Physical
>     Network dropdown is changed, refresh Network Offering dropdown
>     (because each physical network has its own tags which maps to
>     different network offerings)
>
> by /david/
>
>   edit 	ui/scripts/sharedFunctions.js
>
>
>     Revert "CLOUDSTACK-6650: Reorder Cluster list in deployment
>     planner to protect"
>
> by /david/
>
>   edit 	server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
>   edit 	engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>   edit 	server/src/com/cloud/configuration/Config.java
>   edit 	engine/schema/src/com/cloud/host/dao/HostTagsDao.java
>   delete 	server/test/com/cloud/vm/FirstFitPlannerTest.java
>   edit 	server/src/com/cloud/deploy/FirstFitPlanner.java
>   edit 	core/src/com/cloud/agent/api/StartupRoutingCommand.java
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer620SP1Resource.java 
>
>   edit 	setup/db/db/schema-441to450.sql
>   edit 
> plugins/deployment-planners/implicit-dedication/test/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java 
>
>
>
>     kvm: Add better logging when fetching a volume from libvirt
>
> by /david/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java 
>
>
>
>     vmware resource code needs to honor the timeout value send
>
> by /david/
>
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java 
>
>
>
>     if libvirt version is < 10.10(below rhel 6.5), won't set nic
>     throttling
>
> by /david/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
>
>
>
>     fix build
>
> by /david/
>
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java 
>
>
>
>     if guest network type is vlan://untagged, and traffic label is
>     used, kvm agent needs to honor traffic label
>
> by /david/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java 
>
>
>
>     if vpc public network with snat enabled, then will triger this issue;
>
> by /david/
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>
>
>     disable parallel for xenserver. Also for vmware, if full.clone is
>     enabled and migratecommand will have the behavor of start/stop command
>
> by /david/
>
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>   edit 	api/src/com/cloud/hypervisor/HypervisorGuru.java
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
>
>
>     since max_guest_vm for XS 6.2.0 is 500, change max_guest_vm for XS
>     6.5.0 to 500
>
> by /david/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     CLOUDSTACK-6826: Improving the download url expiration where the
>     expiration work would be handled by the ssvm that has the
>     corresponding symlink created on it. In case it doesnt exist, then
>     would be any one of the ssvm in the zone.
>
> by /david/
>
>   edit 
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java 
>
>   edit 	engine/schema/src/com/cloud/host/dao/HostDao.java
>   edit 
> engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java 
>
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java 
>
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java 
>
>   edit 
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java 
>
>   edit 	engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
>   edit 
> plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java 
>
>   edit 
> services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java 
>
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java 
>
>
>
>     CLOUDSTACK-7699: Disable ROOT volume attach/detach ability.
>
> by /nitin.mehta/
>
>   edit 	server/test/com/cloud/storage/VolumeApiServiceImplTest.java
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>
>
>     CLOUDSTACK-7700: Volume Snapshot Async Job returns Success for a
>     failed
>
> by /min.chen/
>
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>
>
>     Fixed few coverity issues
>
> by /santhosh.edukulla/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
>
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java 
>
>   edit 
> server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java 
>
>   edit 
> vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
>   edit 	plugins/hypervisors/ovm/src/com/cloud/ovm/object/Connection.java
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java 
>
>   edit 
> framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcServerCallImpl.java 
>
>   edit 	agent/src/com/cloud/agent/Agent.java
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>   edit 	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java 
>
>
>
>     CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
>
> by /sanjay.tripathi/
>
>   edit 	server/src/com/cloud/configuration/Config.java
>   edit 	setup/db/db/schema-441to450.sql
>   add 	server/test/com/cloud/vm/FirstFitPlannerTest.java
>   edit 
> plugins/deployment-planners/implicit-dedication/test/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java 
>
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>   edit 	server/src/com/cloud/deploy/FirstFitPlanner.java
>   edit 	server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
>   edit 	engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer620SP1Resource.java 
>
>   edit 	engine/schema/src/com/cloud/host/dao/HostTagsDao.java
>   edit 	core/src/com/cloud/agent/api/StartupRoutingCommand.java
>
>
>     CLOUDSTACK-6650: Reorder Cluster list in deployment planner to protect
>
> by /sanjay.tripathi/
>
>   edit 	setup/db/db/schema-441to450.sql
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>   add 	server/test/com/cloud/vm/FirstFitPlannerTest.java
>   edit 	server/src/com/cloud/configuration/Config.java
>   edit 	server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
>   edit 
> plugins/deployment-planners/implicit-dedication/test/org/apache/cloudstack/implicitplanner/ImplicitPlannerTest.java 
>
>   edit 	server/src/com/cloud/deploy/FirstFitPlanner.java
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer620SP1Resource.java 
>
>   edit 	engine/schema/src/com/cloud/host/dao/HostTagsDao.java
>   edit 	core/src/com/cloud/agent/api/StartupRoutingCommand.java
>   edit 	engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java
>
>
>     Rules and visitors for Load Balance Rules
>
> by /wrodrigues/
>
>   add 	server/src/com/cloud/network/rules/RuleApplier.java
>   add 	server/src/com/cloud/network/router/RouterControlHelper.java
>   add 	server/src/com/cloud/network/rules/UserdataPwdRules.java
>   add 	server/src/com/cloud/network/rules/VpcIpAssociationRules.java
>   add 	server/src/com/cloud/network/rules/FirewallRules.java
>   add 	server/src/com/cloud/network/rules/UserdataToRouterRules.java
>   add 	server/src/com/cloud/network/topology/NetworkTopology.java
>   add 	server/src/com/cloud/network/rules/PrivateGatewayRules.java
>   add 	server/src/com/cloud/network/rules/NetworkAclsRules.java
>   add 	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
>   add 	server/src/com/cloud/network/rules/VpnRules.java
>   add 	server/src/com/cloud/network/topology/NetworkTopologyContext.java
>   add 	server/src/com/cloud/network/rules/LoadBalancingRules.java
>   add 	server/src/com/cloud/network/rules/StaticNatRules.java
>   add 	server/src/com/cloud/network/rules/DhcpRules.java
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   add 	server/src/com/cloud/network/topology/NetworkTopologyVisitor.java
>   add 	server/src/com/cloud/network/topology/AdvancedNetworkTopology.java
>   add 	server/src/com/cloud/network/rules/SshKeyToRouterRules.java
>   add 	server/src/com/cloud/network/rules/PasswordToRouterRules.java
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   add 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   add 	server/src/com/cloud/network/topology/BasicNetworkVisitor.java
>   add 	server/src/com/cloud/network/topology/BasicNetworkTopology.java
>   add 	server/src/com/cloud/network/rules/IpAssociationRules.java
>
>
>     Extract general behavior to Router and Vpc delegates
>
> by /wrodrigues/
>
>   add 
> server/src/com/cloud/network/router/VpcVirtualNetworkHelperImpl.java
>   add 	server/src/com/cloud/network/router/VirtualNwStatus.java
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   add 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java 
>
>   add 	server/src/com/cloud/network/router/VpcVirtualNetworkHelper.java
>
>
>     Fix dependency problem. Extract and unify router deployment stuff
>
> by /wrodrigues/
>
>   delete 
> server/src/com/cloud/network/router/VpcVirtualNetworkHelper.java
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkHelperImpl.java
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java 
>
>   add 	server/src/com/cloud/network/router/RouterDeploymentManager.java
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   edit 	server/src/com/cloud/network/element/VpcVirtualRouterElement.java
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
>   edit 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>   add 
> server/src/com/cloud/network/router/RouterDeploymentDefinition.java
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
>
>
>     Adding Firewall Rules to comply with the Visitor pattern
>     implementation; refactoring the applyRules so we can reuse it.
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/topology/BasicNetworkTopology.java
>   edit 	utils/conf/db.properties
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 	server/src/com/cloud/network/rules/FirewallRules.java
>   edit 	server/src/com/cloud/network/topology/NetworkTopologyContext.java
>   edit 	server/src/com/cloud/network/rules/LoadBalancingRules.java
>   edit 	build/replace.properties
>   edit 	server/src/com/cloud/network/topology/NetworkTopology.java
>   add 	server/src/com/cloud/network/rules/RuleApplierWrapper.java
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>
>
>     changing accessor modifier in instance variables
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/topology/BasicNetworkTopology.java
>
>
>     fixing checkstyles
>
> by /wrodrigues/
>
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 	server/src/com/cloud/network/rules/RuleApplierWrapper.java
>   edit 	server/src/com/cloud/network/rules/FirewallRules.java
>
>
>     finished firewall rules and load balancing rules; fixed all the
>     injection problems; added VirtualMachineManager to the appliance
>     factory to be injected.
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/topology/BasicNetworkTopology.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 	server/src/com/cloud/network/topology/NetworkTopologyContext.java
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   add 
> server/src/com/cloud/network/router/NEWVirtualNetworkApplianceManagerImpl.java 
>
>
>
>     TODO
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/topology/BasicNetworkTopology.java
>
>
>     adding static nat rules. Deploying new VMs is not working due to
>     the appliance refactory, will check the changes with Antonio tomorrow.
>
> by /wrodrigues/
>
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/router/RouterDeploymentManager.java
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   edit 	server/src/com/cloud/network/topology/BasicNetworkTopology.java
>   edit 	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
>   edit 	server/src/com/cloud/network/rules/StaticNatRules.java
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   edit 	server/src/com/cloud/network/topology/NetworkTopology.java
>
>
>     we have to check if VPC is null bfore calling it. VPC is not used
>     in gest networks, so deploying a new VM was broken.
>
> by /wrodrigues/
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/src/com/cloud/network/router/RouterDeploymentDefinition.java
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   edit 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>
>
>     adding apache license headers
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/router/RouterDeploymentManager.java
>   edit 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>   edit 	server/src/com/cloud/network/router/VirtualNwStatus.java
>   edit 	server/src/com/cloud/network/router/RouterControlHelper.java
>
>
>     adding Ip Association and VPN Rules
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/topology/NetworkTopology.java
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   edit 	server/src/com/cloud/network/rules/IpAssociationRules.java
>   edit 	server/src/com/cloud/network/topology/NetworkTopologyVisitor.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/topology/BasicNetworkTopology.java
>   edit 	server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
>   edit 	server/src/com/cloud/network/rules/VpnRules.java
>
>
>     Fix offering setup
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/router/RouterDeploymentManager.java
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>     package rename
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/rules/PasswordToRouterRules.java
>   edit 	server/src/com/cloud/network/rules/DhcpRules.java
>   delete 
> server/src/com/cloud/network/topology/NetworkTopologyContext.java
>   edit 	server/src/com/cloud/network/rules/FirewallRules.java
>   add 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   delete 
> server/src/com/cloud/network/topology/AdvancedNetworkVisitor.java
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 	server/src/com/cloud/network/rules/VpnRules.java
>   delete 	server/src/com/cloud/network/topology/NetworkTopology.java
>   edit 	server/src/com/cloud/network/rules/LoadBalancingRules.java
>   edit 	server/src/com/cloud/network/rules/NetworkAclsRules.java
>   add 
> server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java 
>
>   add 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   add 
> server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
>   edit 	server/src/com/cloud/network/rules/IpAssociationRules.java
>   edit 	server/src/com/cloud/network/rules/StaticNatRules.java
>   add 	server/src/com/cloud/network/rules/DhcpEntryRules.java
>   delete 
> server/src/com/cloud/network/topology/AdvancedNetworkTopology.java
>   delete 
> server/src/com/cloud/network/topology/NetworkTopologyVisitor.java
>   edit 	server/src/com/cloud/network/rules/UserdataToRouterRules.java
>   delete 	server/src/com/cloud/network/topology/BasicNetworkVisitor.java
>   add 	server/src/com/cloud/network/rules/DhcpSubNetRules.java
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   edit 	server/src/com/cloud/network/rules/UserdataPwdRules.java
>   add 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   edit 	server/src/com/cloud/network/rules/PrivateGatewayRules.java
>   add 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   add 
> server/src/org/apache/cloudstack/network/topology/NetworkTopologyContext.java 
>
>   edit 	server/src/com/cloud/network/rules/VpcIpAssociationRules.java
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   delete 	server/src/com/cloud/network/topology/BasicNetworkTopology.java
>   edit 	server/src/com/cloud/network/rules/SshKeyToRouterRules.java
>
>
>     Temporary put state info in a state object
>
> by /wrodrigues/
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>     fixing the classes relationship; adding beans properly in the
>     spring context; using the right basic/advance stuff; testing ip
>     and port forwarding rules
>
> by /wrodrigues/
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>
>
>     adding password to router rules; moving the advance code to the
>     advance net topology.
>
> by /wrodrigues/
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   edit 	server/src/com/cloud/network/rules/PasswordToRouterRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>
>
>     Unify and encapsulate deployment flow methods and params
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/router/RouterDeploymentManager.java
>   edit 
> server/src/com/cloud/network/router/RouterDeploymentDefinition.java
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>
>
>     adding userdata to router and ssh pub key to router rules.
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 	server/src/com/cloud/network/rules/PasswordToRouterRules.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/rules/UserdataToRouterRules.java
>   edit 	server/src/com/cloud/network/rules/IpAssociationRules.java
>   edit 	server/src/com/cloud/network/rules/SshKeyToRouterRules.java
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>
>
>     making instance variables compliant with ACS convention
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/rules/LoadBalancingRules.java
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 	server/src/com/cloud/network/rules/StaticNatRules.java
>   edit 	server/src/com/cloud/network/rules/PasswordToRouterRules.java
>   edit 	server/src/com/cloud/network/rules/VpcIpAssociationRules.java
>   edit 	server/src/com/cloud/network/rules/DhcpRules.java
>   edit 	server/src/com/cloud/network/rules/FirewallRules.java
>   edit 	server/src/com/cloud/network/rules/NetworkAclsRules.java
>   edit 	server/src/com/cloud/network/rules/DhcpSubNetRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 	server/src/com/cloud/network/rules/UserdataToRouterRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopologyContext.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/rules/PrivateGatewayRules.java
>   edit 	server/src/com/cloud/network/rules/SshKeyToRouterRules.java
>   edit 	server/src/com/cloud/network/rules/UserdataPwdRules.java
>   edit 	server/src/com/cloud/network/rules/DhcpEntryRules.java
>   edit 	server/src/com/cloud/network/rules/IpAssociationRules.java
>   edit 	server/src/com/cloud/network/rules/RuleApplierWrapper.java
>   edit 	server/src/com/cloud/network/rules/VpnRules.java
>
>
>     adding user data pwd rules
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   edit 	server/src/com/cloud/network/rules/UserdataPwdRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
>
>
>     fixing injection of beans with a relationship
>
> by /wrodrigues/
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopologyContext.java 
>
>
>
>     whitespace
>
> by /wrodrigues/
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>
>
>     fixing the injection of the networkDao
>
> by /wrodrigues/
>
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>
>
>     Deployment more OO - Objects with data and behavior
>
> by /wrodrigues/
>
>   edit 
> server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkHelperImpl.java
>   delete 
> server/src/com/cloud/network/router/RouterDeploymentManager.java
>   delete 
> server/src/com/cloud/network/router/RouterDeploymentDefinition.java
>   edit 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>   add 
> server/src/com/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 	server/src/com/cloud/network/element/VpcVirtualRouterElement.java
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   add 
> server/src/com/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java 
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
>   add 
> server/src/com/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>     replacing my IP by localhost to avoid problems with my environment
>
> by /wrodrigues/
>
>   edit 	utils/conf/db.properties
>   edit 	build/replace.properties
>
>
>     fixing import in virtual router element and checkstyle in dhcp
>     entry related changes
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopologyContext.java 
>
>   edit 	server/src/com/cloud/network/rules/DhcpEntryRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>
>
>     commenting broken code in tests in order to run build adn tests
>     other changes via the UI
>
> by /wrodrigues/
>
>   edit 
> server/test/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java 
>
>
>
>     removing bean from the xml
>
> by /wrodrigues/
>
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>
>
>     adding new bean to spring context file; renaming package from
>     "com" to "org"
>
> by /wrodrigues/
>
>   add 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   add 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   delete 
> server/src/com/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java 
>
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>   add 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java 
>
>   delete 
> server/src/com/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   delete 
> server/src/com/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 	server/src/com/cloud/network/element/VpcVirtualRouterElement.java
>
>
>     Fixing null pointers during vpc router deployment
>
> by /wrodrigues/
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>
>
>     apply network acls; acls items to pvt gw; vpc ip association
>
> by /wrodrigues/
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/rules/VpcIpAssociationRules.java
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   add 	server/src/com/cloud/network/rules/NicPlugInOutRules.java
>   edit 	server/src/com/cloud/network/rules/NetworkAclsRules.java
>   edit 
> plugins/network-elements/ovs/src/com/cloud/network/element/OvsElement.java 
>
>   edit 	server/src/com/cloud/network/rules/SshKeyToRouterRules.java
>   edit 
> server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
>   edit 	server/src/com/cloud/network/element/VpcVirtualRouterElement.java
>
>
>     fixing VPC IP Association and ACL rules. Have to rewrite in a
>     better why the apply rules method in the Advanced Topology
>
> by /wrodrigues/
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/rules/NicPlugInOutRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 	server/src/com/cloud/network/rules/VpcIpAssociationRules.java
>
>
>     Splitting Vpc and NonVpc deployment into phases & testing it
>
> by /wrodrigues/
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>
>
>     RouterDeployment and VPC. Improving code and Unit Testing
>
> by /wrodrigues/
>
>   add 
> server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   add 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java 
>
>
>
>     More refactoring and testing in the same classes
>
> by /wrodrigues/
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java 
>
>   edit 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>
>
>     License headers
>
> by /wrodrigues/
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java 
>
>
>
>     Replacing the old [Vpc}VirtualNetworkApplianceManager by the new ones;
>
> by /wrodrigues/
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   edit 
> server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java 
>
>   edit 	server/src/com/cloud/network/rules/DhcpRules.java
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   delete 
> server/src/com/cloud/network/router/NEWVirtualNetworkApplianceManagerImpl.java 
>
>   edit 	server/src/com/cloud/network/rules/DhcpSubNetRules.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>
>
>     Complete tests for normal deployment and start vpc one
>
> by /wrodrigues/
>
>   edit 
> server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 
> server/test/com/cloud/network/element/VirtualRouterElementTest.java
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml 
>
>   edit 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java 
>
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   edit 
> server/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml 
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   edit 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>   add 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java 
>
>
>
>     Factor out prepareDeployment and update tests
>
> by /wrodrigues/
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java 
>
>
>
>     Increasing test coverage for Vpc Deployment
>
> by /wrodrigues/
>
>   edit 
> server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>
>
>     Fix unnecessary changes Spring contexts
>
> by /wrodrigues/
>
>   edit 
> server/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml 
>
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml 
>
>
>
>     moving sendCommand to the NetworkGeneralHelper;
>
> by /wrodrigues/
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   edit 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
>
>
>     fixing check styles
>
> by /wrodrigues/
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>
>
>     Refactor to include network creation as actual deployment
>
> by /wrodrigues/
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   add 	server/src/com/cloud/network/router/VpcNetworkHelperImpl.java
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   delete 	server/src/com/cloud/network/router/NetworkGeneralHelper.java
>   edit 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java 
>
>   add 	server/src/com/cloud/network/router/VpcNetworkHelper.java
>   add 	server/src/com/cloud/network/router/NetworkHelperImpl.java
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   add 	server/src/com/cloud/network/router/NetworkHelper.java
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java 
>
>   delete 
> server/src/com/cloud/network/router/VpcVirtualNetworkHelperImpl.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>
>
>     adding applyStaticRoutes method to the network topology/visitor.
>     it will be used by the VPC virtual net manager appliance.
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/router/NetworkHelperImpl.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   delete 	server/src/com/cloud/network/router/VirtualNwStatus.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>   edit 	server/src/com/cloud/network/router/VpcNetworkHelperImpl.java
>   add 	server/src/com/cloud/network/rules/StaticRoutesRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   add 	server/src/com/cloud/network/router/VirtualNetworkStatus.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java 
>
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>
>
>     adding applyStaticRoutes to the new visitor pattern.
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/rules/StaticRoutesRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 
> server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
>   edit 	server/src/com/cloud/network/element/VpcVirtualRouterElement.java
>
>
>     DeployRouter includes nw creation following TellDontAsk principle
>
> by /wrodrigues/
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java 
>
>   edit 	server/src/com/cloud/network/router/VpcNetworkHelperImpl.java
>   delete 	server/src/com/cloud/network/router/VpcNetworkHelper.java
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   add 	server/src/com/cloud/network/router/NicProfileHelper.java
>   add 	server/src/com/cloud/network/router/NicProfileHelperImpl.java
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   edit 	server/src/com/cloud/network/router/NetworkHelper.java
>   edit 
> server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java 
>
>   edit 	server/src/com/cloud/network/router/NetworkHelperImpl.java
>
>
>     Whole router.deployment package got 97% coverage
>
> by /wrodrigues/
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>
>
>     adding setupPrivateGateway to new style;
>
> by /wrodrigues/
>
>   edit 
> server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   edit 	server/src/com/cloud/network/element/VpcVirtualRouterElement.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 	server/src/com/cloud/network/rules/PrivateGatewayRules.java
>
>
>     fixing check style issues
>
> by /wrodrigues/
>
>   add 	server/src/com/cloud/network/rules/AdvancedVpnRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
>   edit 	server/src/com/cloud/network/rules/PrivateGatewayRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   edit 	server/src/com/cloud/network/element/VpcVirtualRouterElement.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>
>
>     Refactor and test NetworkHelper#sendCommandsToRouterWithNoAnswers
>
> by /wrodrigues/
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 	server/src/com/cloud/network/router/RouterControlHelper.java
>   add 	server/test/com/cloud/network/router/NetworkHelperImplTest.java
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 	server/src/com/cloud/network/router/NetworkHelperImpl.java
>   add 	server/test/com/cloud/network/router/RouterControlHelperTest.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>
>
>     Missing license headers
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/router/NicProfileHelper.java
>   edit 	server/src/com/cloud/network/router/NetworkHelper.java
>
>
>     refactor all private methods in the virtual router appliance and
>     VPC appliance
>
> by /wrodrigues/
>
>   add 	server/src/com/cloud/network/router/CommandSetupHelper.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/rules/StaticNatRules.java
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 	server/src/com/cloud/network/rules/LoadBalancingRules.java
>   edit 	server/src/com/cloud/network/rules/NetworkAclsRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   edit 	server/src/com/cloud/network/rules/PasswordToRouterRules.java
>   edit 	server/src/com/cloud/network/rules/VpcIpAssociationRules.java
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java 
>
>   edit 	server/src/com/cloud/network/rules/StaticRoutesRules.java
>   edit 	server/src/com/cloud/network/rules/SshKeyToRouterRules.java
>   edit 	server/src/com/cloud/network/rules/DhcpEntryRules.java
>   edit 	server/src/com/cloud/network/rules/FirewallRules.java
>   edit 	server/src/com/cloud/network/rules/VpnRules.java
>   edit 	server/src/com/cloud/network/rules/PrivateGatewayRules.java
>   edit 	server/src/com/cloud/network/rules/IpAssociationRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
>   edit 	server/src/com/cloud/network/rules/UserdataPwdRules.java
>   edit 	server/src/com/cloud/network/rules/DhcpSubNetRules.java
>
>
>     auto wire the network helper
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/router/CommandSetupHelper.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>
>
>     Refactor hypervisor retrieval from VpcNwHelper and NwHelper
>
> by /wrodrigues/
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 	server/src/com/cloud/network/router/NetworkHelper.java
>   edit 	server/src/com/cloud/network/vpc/VpcManagerImpl.java
>   edit 
> server/test/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   edit 	server/src/com/cloud/network/router/VpcNetworkHelperImpl.java
>   edit 	server/src/com/cloud/network/router/NetworkHelperImpl.java
>
>
>     Fixing NPE due to use of dependencies before Spring injection
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/router/VpcNetworkHelperImpl.java
>
>
>     fix dhcp subnet rules. we can create VMs again.
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/rules/DhcpSubNetRules.java
>
>
>     fixing nic plug unplug rule
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/rules/NicPlugInOutRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   edit 	server/src/com/cloud/network/router/CommandSetupHelper.java
>
>
>     merging cmd-visitor into cmd-visitor-rebase, with the upstream
>     from ACS repo
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/rules/VpcIpAssociationRules.java
>   edit 	server/src/com/cloud/network/rules/DhcpRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 	server/src/com/cloud/network/rules/PrivateGatewayRules.java
>   edit 	server/src/com/cloud/network/rules/DhcpSubNetRules.java
>   edit 	server/src/com/cloud/network/rules/NicPlugInOutRules.java
>   edit 	server/src/com/cloud/network/rules/AdvancedVpnRules.java
>
>
>     Fix: VpcRouter has always PublicIp setup as it did before refactoring
>
> by /wrodrigues/
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>
>
>     making sure the instance variable _router in the Rules is being
>     used instead of the parameter
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/router/NetworkHelperImpl.java
>   edit 	server/src/com/cloud/network/router/CommandSetupHelper.java
>   edit 	server/src/com/cloud/network/router/NetworkHelper.java
>
>
>     removing the root password becuase it was breaking the simulator
>     tests. Root password must always be empty
>
> by /wrodrigues/
>
>   edit 	utils/conf/db.properties
>
>
>     Removing the VirtualNetworkStatus, it was not being used properly;
>
> by /wrodrigues/
>
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/router/NetworkHelper.java
>   edit 	server/src/com/cloud/network/router/VpcNetworkHelperImpl.java
>   delete 	server/src/com/cloud/network/router/VirtualNetworkStatus.java
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>   edit 	server/src/com/cloud/network/router/NetworkHelperImpl.java
>
>
>     Adding fixes for the add user data and vpn rules
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/element/VpcVirtualRouterElement.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/router/CommandSetupHelper.java
>
>
>     Changing the way the DAOs were being injected in the RuleApplier;
>
> by /wrodrigues/
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   edit 	server/src/com/cloud/network/rules/UserdataPwdRules.java
>   edit 	server/src/com/cloud/network/rules/UserdataToRouterRules.java
>   edit 	server/src/com/cloud/network/rules/RuleApplier.java
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 	server/src/com/cloud/network/rules/DhcpSubNetRules.java
>   edit 	server/src/com/cloud/network/rules/FirewallRules.java
>   edit 	server/src/com/cloud/network/rules/DhcpEntryRules.java
>   edit 	server/src/com/cloud/network/rules/LoadBalancingRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   edit 	server/src/com/cloud/network/rules/VpcIpAssociationRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   edit 	server/src/com/cloud/network/rules/NicPlugInOutRules.java
>   edit 	server/src/com/cloud/network/rules/DhcpRules.java
>   edit 	server/src/com/cloud/network/rules/PrivateGatewayRules.java
>   edit 	server/src/com/cloud/network/rules/SshKeyToRouterRules.java
>   edit 	server/src/com/cloud/network/rules/AdvancedVpnRules.java
>   edit 	server/src/com/cloud/network/rules/PasswordToRouterRules.java
>
>
>     fixing checkstyle in the virtual network manager. problem appeared
>     after a rebase. probably due to my saving action in the eclipse
>     workspace
>
> by /wrodrigues/
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>     Fixing the NetworkHelperImpl class. It was throwing a NPE due to a
>     hypervisor type SIMULATOR not being in the hashmap.
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/router/NetworkHelperImpl.java
>
>
>     CLOUDSTACK-6278 Baremetal Advanced Networking support from commit
>     id e06fa18ed2ee2ee6a417e089cf5ac6bde11d0079 by Frank Zhang
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/router/NetworkHelperImpl.java
>
>
>     Applying the latest chances from the VPC Refactor branch onto the
>     new one.
>
> by /wrodrigues/
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java 
>
>   edit 
> server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopology.java
>   edit 	server/src/com/cloud/network/router/NetworkHelperImpl.java
>   edit 	server/src/com/cloud/network/rules/LoadBalancingRules.java
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   add 	server/src/com/cloud/network/rules/DhcpPvlanRules.java
>   delete 	server/src/com/cloud/network/rules/DhcpRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkTopology.java 
>
>   add 	server/src/com/cloud/network/rules/BasicVpnRules.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/AdvancedNetworkVisitor.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java 
>
>   edit 
> server/test/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java 
>
>   edit 	server/src/com/cloud/network/rules/DhcpEntryRules.java
>   edit 	server/src/com/cloud/network/router/CommandSetupHelper.java
>   edit 
> server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java 
>
>   edit 
> server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java 
>
>   edit 
> server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
>   edit 
> server/src/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java 
>
>   delete 	server/src/com/cloud/network/rules/VpnRules.java
>
>
>     Applygin fix from commit ID aaeadc5c44e3fe16a1deea5348b085b08b5f4f4d
>
> by /wrodrigues/
>
>   edit 
> server/src/org/cloud/network/router/deployment/RouterDeploymentDefinition.java 
>
>   edit 
> server/test/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java 
>
>   edit 
> server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java 
>
>
>
>     Applying fix from commit id 6b8e0baa21e6cffc62eb2d35eecc7aeb2087d1c1
>
> by /wrodrigues/
>
>   edit 	server/src/com/cloud/network/router/CommandSetupHelper.java
>
>
>     Fixing checkstyle.
>
> by /wrodrigues/
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>     CLOUDSTACK-7563: Fix potential NPE from FingBugs.
>
> by /min.chen/
>
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>
>
>     CLOUDSTACK-7563: Fix potential NPE from FingBugs.
>
> by /min.chen/
>
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>
>
>     Adding a snapshot strategy for systems that want to take snapshots
>     that reside on their own system (as opposed to the default
>     approach of taking a hypervisor snapshot and then copying it to
>     secondary storage)
>
> by /mike.tutkowski/
>
>   add 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>   edit 
> engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreCapabilities.java 
>
>   edit 	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java 
>
>   edit 
> engine/storage/snapshot/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml 
>
>
>
>     CLOUDSTACK-7723: UI > Storage > detail view > add Disk Offering field.
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     CLOUDSTACK-7723: UI > Storage > detail view > add Disk Offering field.
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     Fixing possible formatting issue with license header, causing
>     builds to fail. Works well locally
>
> by /amogh.vasekar/
>
>   edit 
> core/src/com/cloud/agent/api/baremetal/PrepareKickstartPxeServerCommand.java 
>
>
>
>     Implementing snapshot-strategy support for reverting a volume to a
>     snapshot
>
> by /mike.tutkowski/
>
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>   edit 	api/src/com/cloud/storage/Volume.java
>   edit 	server/src/com/cloud/api/ApiResponseHelper.java
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java 
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java 
>
>
>
>     vGPU VMSnapshot Test Automation
>
> by /sailaja.mada/
>
>   edit 	test/integration/component/test_deploy_vgpu_vm.py
>
>
>     CLOUDSTACK-7693: Fixing pep8 issues
>
> by /talluri/
>
>   edit 	test/integration/component/test_recurring_snapshots.py
>   edit 	test/integration/component/test_routers.py
>
>
>     CLOUDSTACK-7693: Fixing pep8 issues
>
> by /talluri/
>
>   edit 	test/integration/component/test_recurring_snapshots.py
>   edit 	test/integration/component/test_routers.py
>
>
>     CLOUDSTACK-7690: Added missing unittest import to
>     test_escalations_volumes.py
>
> by /talluri/
>
>   edit 	test/integration/component/test_escalations_volumes.py
>
>
>     CLOUDSTACK-7690: Added missing unittest import to
>     test_escalations_volumes.py
>
> by /talluri/
>
>   edit 	test/integration/component/test_escalations_volumes.py
>
>
>     CLOUDSTACK-7532: Template status is not shown in UI/API response
>     for non-default account users. Show it if the owner of the
>     template is the caller
>
> by /nitin.mehta/
>
>   edit 	server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
>
>
>     CLOUDSTACK-7532: Template status is not shown in UI/API response
>     for non-default account users. Show it if the owner of the
>     template is the caller
>
> by /nitin.mehta/
>
>   edit 	server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
>
>
>     CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a
>     part of the guest ip range.
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
>
>
>     CLOUDSTACK-7728: Fixed adding icmp rules with different types and
>     codes
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
>
>
>     CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on
>     VR reboot
>
> by /jayapal/
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>     CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a
>     part of the guest ip range.
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
>
>
>     CLOUDSTACK-7728: Fixed adding icmp rules with different types and
>     codes
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
>
>
>     CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on
>     VR reboot
>
> by /jayapal/
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>     CLOUDSTACK-7729: listVMSnapshot API not returning parent id in
>     response
>
> by /kishan/
>
>   edit 	server/src/com/cloud/api/ApiResponseHelper.java
>   edit 
> api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
>
>
>     CLOUDSTACK-7728: Removed duplicate import
>
> by /jayapal/
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>     Fixed coverity and other resource leak issues
>
> by /santhosh.edukulla/
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>   edit 	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
>   edit 	server/src/com/cloud/api/doc/ApiXmlDocWriter.java
>
>
>     Removed duplicate code and unused imports which was causing build
>     failure.
>
> by /sanjay.tripathi/
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java 
>
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>
>
>     Config value having different category in SQL and Config.java.
>
> by /sanjay.tripathi/
>
>   edit 	server/src/com/cloud/configuration/Config.java
>
>
>     CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the
>     CloudStack UI.
>
> by /sanjay.tripathi/
>
>   edit 	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
>   edit 	ui/scripts/configuration.js
>
>
>     Config value having different category in SQL and Config.java.
>
> by /sanjay.tripathi/
>
>   edit 	server/src/com/cloud/configuration/Config.java
>
>
>     CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the
>     CloudStack UI.
>
> by /sanjay.tripathi/
>
>   edit 	ui/scripts/configuration.js
>   edit 	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
>
>
>     CLOUDSTACK-7727 Skip various BVT tests on LXC
>
> by /talluri/
>
>   edit 	test/integration/smoke/test_vm_life_cycle.py
>   edit 	test/integration/smoke/test_snapshots.py
>   edit 	test/integration/smoke/test_templates.py
>   edit 	test/integration/smoke/test_scale_vm.py
>   edit 	test/integration/smoke/test_vm_snapshots.py
>   edit 	test/integration/smoke/test_primary_storage.py
>
>
>     CLOUDSTACK-7727 Skip various BVT tests on LXC
>
> by /talluri/
>
>   edit 	test/integration/smoke/test_scale_vm.py
>   edit 	test/integration/smoke/test_primary_storage.py
>   edit 	test/integration/smoke/test_vm_snapshots.py
>   edit 	test/integration/smoke/test_templates.py
>   edit 	test/integration/smoke/test_vm_life_cycle.py
>   edit 	test/integration/smoke/test_snapshots.py
>
>
>     CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by
>     zone/pod/cluster view > listView > detailView > add View All link
>     (i.e. "View all Virtual Routers").
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by
>     account view > listView > detailView > add View All link (i.e.
>     "View all Virtual Routers").
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7736: UI - listView widget - select view dropdown on
>     top of listView - prefilter() - include original args.context when
>     passing it to prefilter().
>
> by /jessicawang/
>
>   edit 	ui/scripts/ui/widgets/listView.js
>
>
>     CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by
>     XXXXXXX view > listView > detailView > add View All link > not
>     show "group by XXXXXXX" in select view dropdown.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by
>     XXXXXXX view > listView > detailView > add View All link > show
>     read-only text "group by zone/pod/cluster/account" in select view
>     area.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by
>     zone/pod/cluster view > listView > detailView > add View All link
>     (i.e. "View all Virtual Routers").
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by
>     account view > listView > detailView > add View All link (i.e.
>     "View all Virtual Routers").
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7736: UI - listView widget - select view dropdown on
>     top of listView - prefilter() - include original args.context when
>     passing it to prefilter().
>
> by /jessicawang/
>
>   edit 	ui/scripts/ui/widgets/listView.js
>
>
>     CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by
>     XXXXXXX view > listView > detailView > add View All link > not
>     show "group by XXXXXXX" in select view dropdown.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by
>     XXXXXXX view > listView > detailView > add View All link > show
>     read-only text "group by zone/pod/cluster/account" in select view
>     area.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     fix kvm issue, for windows sever 2008, it will crash without
>     hyperv enlightment featre enabled
>
> by /sudison/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java 
>
>   edit 
> plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java 
>
>
>
>     CLOUDSTACK-7744: UI > Instances > detailView > Change Service
>     Offering > show generic notification.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instances.js
>
>
>     CLOUDSTACK-7744: UI > Instances > detailView > Change Service
>     Offering > show generic notification.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instances.js
>
>
>     There are few cases that mgt server won't reponse agent's
>     pingcommand timely, or in KVM's case, libvirt won't repsonse in
>     few mintues, which will cause agent reconnect to mgt server, then
>     all the on going tasks on host will fail
>
> by /sudison/
>
>   edit 	agent/src/com/cloud/agent/Agent.java
>
>
>     restore barematel work after merge
>
> by /daan/
>
>   add 
> plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/BaremetalProvisionDoneNotificationCmd.java 
>
>   edit 	utils/src/com/cloud/utils/xmlobject/XmlObject.java
>   edit 	systemvm/patches/debian/config/opt/cloud/bin/baremetal_snat.sh
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java 
>
>   edit 	server/test/com/cloud/storage/VolumeApiServiceImplTest.java
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java 
>
>   edit 	api/src/com/cloud/event/EventTypes.java
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>   edit 	systemvm/patches/debian/config/opt/cloud/bin/prepare_pxe.sh
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java 
>
>   add 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java 
>
>   edit 	systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeElement.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java 
>
>   edit 	server/src/com/cloud/configuration/Config.java
>   edit 	test/integration/component/test_deploy_vgpu_vm.py
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>   edit 	utils/src/com/cloud/utils/xmlobject/XmlObjectParser.java
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java 
>
>   edit 	server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
>   edit 	utils/test/com/cloud/utils/xmlobject/TestXmlObject.java
>   delete 
> core/src/com/cloud/agent/api/baremetal/PrepareKickstartPxeServerCommand.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/Force10BaremetalSwitchBackend.java 
>
>   edit 
> plugins/hypervisors/baremetal/resources/META-INF/cloudstack/core/spring-baremetal-core-context.xml 
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>     rats
>
> by /daan/
>
>   edit 	server/test/com/cloud/network/router/RouterControlHelperTest.java
>   edit 	server/test/com/cloud/network/router/NetworkHelperImplTest.java
>   edit 
> server/test/com/cloud/network/router/VirtualNetworkApplianceManagerImplTest.java 
>
>
>
>     Adding new test which would verify the fix for issue "The
>     ISO/Template is automatically deleted after URL expires"
>
> by /sanjeev/
>
>   add 	test/integration/smoke/misc/test_escalations_templates.py
>
>
>     CLOUDSTACK-7749: AsyncJob GC thread cannot purge queue items that
>     have been blocking for too long if exception is thrown in
>     expunging some unfinished or completed old jobs, this will make
>     some future jobs stuck.
>
> by /min.chen/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     CLOUDSTACK-7749: AsyncJob GC thread cannot purge queue items that
>     have been blocking for too long if exception is thrown in
>     expunging some unfinished or completed old jobs, this will make
>     some future jobs stuck.
>
> by /min.chen/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/SyncQueueItemDaoImpl.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change
>     label.
>
> by /jessicawang/
>
>   edit 	ui/scripts/network.js
>   edit 	client/WEB-INF/classes/resources/messages.properties
>
>
>     CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change
>     label.
>
> by /jessicawang/
>
>   edit 	ui/scripts/network.js
>   edit 	client/WEB-INF/classes/resources/messages.properties
>
>
>     CLOUDSTACK-7754: Templates source_template_id is null when it is
>     created from Snapshot with its corresponding volume removed. Fix
>     it by searching for volumes including removed.
>
> by /nitin.mehta/
>
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>
>
>     CLOUDSTACK-7754: Templates source_template_id is null when it is
>     created from Snapshot with its corresponding volume removed. Fix
>     it by searching for volumes including removed.
>
> by /nitin.mehta/
>
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>
>
>     CLOUDSTACK-7754: Templates source_template_id is null when it is
>     created from Snapshot with its corresponding volume removed. Fix
>     it by searching for volumes including removed. Also bring the
>     logic of setting source template id to create() method than
>     execute which was wrongly put in.
>
> by /nitin.mehta/
>
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>
>
>     Revert "fix kvm issue, for windows sever 2008, it will crash
>     without hyperv enlightment featre enabled"
>
> by /sudison/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java 
>
>   edit 
> plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
>
>
>
>     Revert "There are few cases that mgt server won't reponse agent's
>     pingcommand timely, or in KVM's case, libvirt won't repsonse in
>     few mintues, which will cause agent reconnect to mgt server, then
>     all the on going tasks on host will fail"
>
> by /sudison/
>
>   edit 	agent/src/com/cloud/agent/Agent.java
>
>
>     fix kvm issue, for windows sever 2008, it will crash without
>     hyperv enlightment featre enabled
>
> by /sudison/
>
>   edit 
> plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java 
>
>
>
>     There are few cases that mgt server won't reponse agent's
>     pingcommand timely, or in KVM's case, libvirt won't repsonse in
>     few mintues, which will cause agent reconnect to mgt server, then
>     all the on going tasks on host will fail
>
> by /sudison/
>
>   edit 	agent/src/com/cloud/agent/Agent.java
>
>
>     remove unused XS plugins
>
> by /anthony.xu/
>
>   edit 	scripts/vm/hypervisor/xenserver/xcposs/vmops
>   edit 	scripts/vm/hypervisor/xenserver/vmops
>
>
>     don't need to check if pv driver is updated, old pv driver should work
>
> by /anthony.xu/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>
>
>     Snapshot support
>
> by /mike.tutkowski/
>
>   edit 
> engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionStrategy.java 
>
>   add 
> engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java 
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java 
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java 
>
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>
>
>     Logic on SolidFire side for CloudStack snapshots
>
> by /mike.tutkowski/
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java 
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java 
>
>
>
>     Support for back-end snapshots on primary storage
>
> by /mike.tutkowski/
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/util/SolidFireUtil.java 
>
>   edit 
> engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataMotionStrategy.java 
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java 
>
>   edit 
> plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java 
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java 
>
>   edit 	api/src/com/cloud/agent/api/to/DiskTO.java
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java 
>
>   edit 	core/src/com/cloud/storage/resource/StorageProcessor.java
>   edit 	api/src/com/cloud/storage/Volume.java
>   add 
> core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyCommand.java 
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java 
>
>   add 
> core/src/org/apache/cloudstack/storage/command/SnapshotAndCopyAnswer.java
>
>
>     Logic around granting and revoking access to the volume that backs
>     the snapshot
>
> by /mike.tutkowski/
>
>   edit 	api/src/com/cloud/agent/api/to/DiskTO.java
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java 
>
>
>
>     Changed "boolean connectVolumeToHost(VolumeInfo, Host, DataStore)"
>     to "boolean grantAccess(DataObject, Host, DataStore)"
>
> by /mike.tutkowski/
>
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 
> plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java 
>
>   edit 
> plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java 
>
>   edit 
> plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java 
>
>   edit 
> plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java 
>
>   edit 
> engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java 
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java 
>
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>   edit 
> engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java 
>
>   edit 
> engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java 
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>   edit 
> engine/api/src/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java 
>
>   edit 
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java 
>
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>
>
>     Invoke grantAccess and revokeAccess one time each using a
>     SnapshotInfo (where previously a VolumeInfo was being passed in)
>
> by /mike.tutkowski/
>
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java 
>
>   edit 	api/src/com/cloud/agent/api/to/DiskTO.java
>
>
>     Improve error handling for a host-side error
>
> by /mike.tutkowski/
>
>   edit 
> engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java 
>
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>
>
>     Pass on new command
>
> by /mike.tutkowski/
>
>   edit 
> core/src/com/cloud/storage/resource/StorageSubsystemCommandHandlerBase.java 
>
>
>
>     Save off the UUID of the VDI before detaching its SR
>
> by /mike.tutkowski/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java 
>
>
>
>     Reply that reverting is not supported
>
> by /mike.tutkowski/
>
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java 
>
>
>
>     Reorganized the snapshot logic a bit
>
> by /mike.tutkowski/
>
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>
>
>     CLOUDSTACK-7762 -[Automation] - Fix test failure for
>     test_02_revert_vm_snapshots in smoke/test_vm_snapshots.py
>
> by /sangeetha.hariharan/
>
>   edit 	test/integration/smoke/test_vm_snapshots.py
>
>
>     fix expried certificate in unit test
>
> by /frank.zhang/
>
>   edit 	server/test/resources/certs/rsa_self_signed.key
>   edit 	server/test/resources/certs/rsa_self_signed.crt
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.key
>   edit 	server/test/resources/certs/rsa_ca_signed.crt
>   edit 	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
>   edit 	server/test/resources/certs/rsa_ca_signed.key
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.crt
>
>
>     CLOUDSTACK-7761:
>
> by /anthony.xu/
>
>   edit 
> engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
>   edit 
> server/src/com/cloud/storage/secondary/SecondaryStorageListener.java
>   edit 
> server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java
>   edit 	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
>   edit 
> services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java 
>
>
>
>     CLOUDSTACK-7761:
>
> by /anthony.xu/
>
>   edit 
> engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
>   edit 
> server/src/com/cloud/storage/secondary/SecondaryStorageListener.java
>   edit 
> server/src/com/cloud/storage/secondary/SecondaryStorageVmManager.java
>   edit 
> services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java 
>
>   edit 	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
>
>
>     Update to SolidFire driver regarding snapshots
>
> by /mike.tutkowski/
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java 
>
>
>
>     CLOUDSTACK-7769 - Fixed test_ssvm.py script
>
> by /sangeetha.hariharan/
>
>   edit 	test/integration/smoke/test_ssvm.py
>
>
>     CLOUDSTACK-7771: Throw exception while restoring vm if the
>     template is already deleted. Also fix the usage event being
>     generated from the right template id and fix the log message which
>     sometime showed incorrect template id.
>
> by /nitin.mehta/
>
>   edit 	server/src/com/cloud/api/query/QueryManagerImpl.java
>   edit 	server/test/com/cloud/vm/UserVmManagerTest.java
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>
>
>     when host is pingtimeout and CCP can not determine the host
>     status, put the host to Alert status , no VM HA.
>
> by /anthony.xu/
>
>   edit 
> engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
>   edit 	api/src/com/cloud/host/Status.java
>   edit 	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
>
>
>     when host is pingtimeout and CCP can not determine the host
>     status, put the host to Alert status , no VM HA.
>
> by /anthony.xu/
>
>   edit 	api/src/com/cloud/host/Status.java
>   edit 	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
>   edit 
> engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
>
>
>     CS-21296: hidden snapshot.backup.rightafter, as it's not needed
>
> by /sudison/
>
>   edit 	server/src/com/cloud/configuration/Config.java
>
>
>     CLOUDSTACK-7774 Description field is missing in Health policy API's
>
> by /rajesh.battala/
>
>   edit 
> api/src/org/apache/cloudstack/api/response/LBHealthCheckPolicyResponse.java 
>
>
>
>     CLOUDSTACK-5762: VM wizard, custom compute offering: Fix error label
>
> by /brian.federle/
>
>   edit 	ui/css/cloudstack3.css
>
>
>     unexplained happy flow for restart network modified
>
> by /daan/
>
>   edit 
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java 
>
>
>
>     Fixed incorrect label issue.
>
> by /brian.federle/
>
>   edit 	ui/dictionary.jsp
>   edit 	client/WEB-INF/classes/resources/messages.properties
>   edit 	ui/dictionary2.jsp
>   edit 	ui/scripts/zoneWizard.js
>
>
>     CLOUDSTACK-7777: UI > storage > volume > attach disk > virtual
>     machine dropdown > remove unnecessary module check.
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     CLOUDSTACK-7777: UI > storage > volume > attach disk > virtual
>     machine dropdown > remove unnecessary module check.
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     CLOUDSTACK-7778: Start VM checkWorkItem loop should also check VM
>     DB state before going into idle waiting to exit faster.
>
> by /min.chen/
>
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>
>
>     CLOUDSTACK-7778: Start VM checkWorkItem loop should also check VM
>     DB state before going into idle waiting to exit faster.
>
> by /min.chen/
>
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>
>
>     even xenserverinvestigator returns true, that means host is up,
>     but XAPI may not work
>
> by /anthony.xu/
>
>   edit 	server/src/com/cloud/ha/XenServerInvestigator.java
>
>
>     CLOUDSTACK-7779: UI > volume action filter, snapshot action filter
>     > extend scope from local to global.
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     CLOUDSTACK-7779: UI > volume action filter, snapshot action filter
>     > extend scope from local to global..
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     CLOUDSTACK-7779: UI > affinity group action filter > extend scope
>     from local to global.
>
> by /jessicawang/
>
>   edit 	ui/scripts/affinity.js
>
>
>     CLOUDSTACK-7779: UI > system action filter > extend scope from
>     local to global.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7779: UI > volume action filter, snapshot action filter
>     > extend scope from local to global.
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     CLOUDSTACK-7779: UI > volume action filter, snapshot action filter
>     > extend scope from local to global..
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     CLOUDSTACK-7779: UI > affinity group action filter > extend scope
>     from local to global.
>
> by /jessicawang/
>
>   edit 	ui/scripts/affinity.js
>
>
>     CLOUDSTACK-7779: UI > system action filter > extend scope from
>     local to global.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7780: UI > storage > volume > detail view > data
>     provider > remove unnecessary module check.
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     CLOUDSTACK-7780: UI > storage > volume > detail view > data
>     provider > remove unnecessary module check.
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     fix expried certificate in unit test
>
> by /frank.zhang/
>
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.key
>   edit 	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
>   edit 	server/test/resources/certs/rsa_self_signed.crt
>   edit 	server/test/resources/certs/rsa_ca_signed.key
>   edit 	server/test/resources/certs/rsa_ca_signed.crt
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.crt
>   edit 	server/test/resources/certs/rsa_self_signed.key
>
>
>     Correct the error message when tried created VM Snapshot with
>     memory on a vGPU Instance.
>
> by /sanjay.tripathi/
>
>   edit 	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
>
>
>     Correct the error message when tried created VM Snapshot with
>     memory on a vGPU Instance.
>
> by /sanjay.tripathi/
>
>   edit 	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
>
>
>     No need to log discrepancy resource count message for Primary and
>     secondary storage.
>
> by /sanjay.tripathi/
>
>   edit 	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
>
>
>     No need to log discrepancy resource count message for Primary and
>     secondary storage.
>
> by /sanjay.tripathi/
>
>   edit 	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
>
>
>     allow reentrance of disassociate ip , if vif is gone, return success
>
> by /anthony.xu/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>
>
>     CLOUDSTACK-7795
>
> by /frank.zhang/
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalRctResponse.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java 
>
>   add 
> plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java 
>
>   edit 	api/src/com/cloud/event/EventTypes.java
>
>
>     CLOUDSTACK-7795
>
> by /frank.zhang/
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java 
>
>   edit 	api/src/com/cloud/event/EventTypes.java
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java 
>
>   add 
> plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalRctResponse.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/database/BaremetalRctVO.java 
>
>
>
>     CLOUDSTACK-7797: listSupportedNetworkServices API takes more than
>     1 second to
>
> by /min.chen/
>
>   edit 	server/src/com/cloud/api/ApiServer.java
>
>
>     CLOUDSTACK-1771: Fix VR IP change when restartnetwork with
>     cleanup=true in basic zone
>
> by /Sheng Yang/
>
>   edit 	server/src/com/cloud/network/NetworkModelImpl.java
>
>
>     fixing build because missig ListBaremetalRctCmd
>
> by /frank.zhang/
>
>   add 
> plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalRctCmd.java 
>
>
>
>     CLOUDSTACK-1771: Fix VR IP change when restartnetwork with
>     cleanup=true in basic zone
>
> by /Sheng Yang/
>
>   edit 	server/src/com/cloud/network/NetworkModelImpl.java
>
>
>     CLOUDSTACK-7798: requestHasSensitiveInfo and
>     responseHasSensitiveInfo annotation are missing from some separate
>     Admin API commands.
>
> by /min.chen/
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java 
>
>
>
>     CLOUDSTACK-7796: UI > instances > detail view > data provider >
>     remove unnecessary module check.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instances.js
>
>
>     CLOUDSTACK-7796: UI > instances > detail view > data provider >
>     remove unnecessary module check.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instances.js
>
>
>     CLOUDSTACK-7797: listSupportedNetworkServices API takes more than
>     1 second to
>
> by /min.chen/
>
>   edit 	server/src/com/cloud/api/ApiServer.java
>
>
>     CLOUDSTACK-7798: requestHasSensitiveInfo and
>     responseHasSensitiveInfo annotation are missing from some separate
>     Admin API commands.
>
> by /min.chen/
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/iso/ListIsoPermissionsCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vmsnapshot/RevertToVMSnapshotCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/account/ListAccountsCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/UploadVolumeCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/ListVolumesCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatePermissionsCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/DetachVolumeCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/address/ListPublicIpAddressesCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/DestroyVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMSSHKeyCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/iso/DetachIsoCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/template/CreateTemplateCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/iso/RegisterIsoCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/UpdateVolumeCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/ResetVMPasswordCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/ScaleVMCmdByAdmin.java
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/iso/ListIsosCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/iso/UpdateIsoCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/network/UpdateNetworkCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/UpdateVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/affinitygroup/UpdateVMAffinityGroupCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/UpgradeVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/RemoveNicFromVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/iso/AttachIsoCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/DeployVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/UpdateDefaultNicForVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/template/RegisterTemplateCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/zone/ListZonesCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/loadbalancer/ListLoadBalancerRuleInstancesCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/MigrateVolumeCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/StartVMCmdByAdmin.java
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/RestoreVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/StopVMCmdByAdmin.java
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/template/UpdateTemplateCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/ListVMsCmdByAdmin.java
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/template/CopyTemplateCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/network/ListNetworksCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/ResizeVolumeCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/volume/AttachVolumeCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/vm/RebootVMCmdByAdmin.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkCmdByAdmin.java 
>
>
>
>     fix kvm agent upgrade issue: kvm agent needs to use java 7 instead
>     of java 6 after upgrade Reviewed-by: Sheng
>
> by /sudison/
>
>   edit 	agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in
>
>
>     CLOUDSTACK-7796: UI > network > detail view > data provider >
>     remove unnecessary module check.
>
> by /jessicawang/
>
>   edit 	ui/scripts/network.js
>
>
>     CLOUDSTACK-7796: UI > Infrastructure > zone > physical network >
>     guest > details tab > network tab > detail view > dataProvider >
>     remove unnecessary module check.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7796: UI > Infrastructure > zones > zone > details tab
>     > dataProvider > remove unnecessary module check.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7796: UI > network > detail view > data provider >
>     remove unnecessary module check.
>
> by /jessicawang/
>
>   edit 	ui/scripts/network.js
>
>
>     CLOUDSTACK-7796: UI > Infrastructure > zone > physical network >
>     guest > details tab > network tab > detail view > dataProvider >
>     remove unnecessary module check.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7796: UI > Infrastructure > zones > zone > details tab
>     > dataProvider > remove unnecessary module check.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7659: UI: Upgrade jquery-validate lib to the latest
>     1.13.0 version with the additional-methods included.
>
> by /brian.federle/
>
>   add 	ui/lib/jquery.validate.additional-methods.js
>   edit 	ui/index.jsp
>   edit 	ui/scripts/ui/core.js
>   edit 	ui/lib/jquery.validate.js
>   edit 	LICENSE
>
>
>     CLOUDSTACK-7720: No IP Address Validation for Acquire new secondary IP
>
> by /brian.federle/
>
>   edit 	ui/scripts/network.js
>
>
>     CLOUDSTACK-7718: No Field Validations on Zone Form
>
> by /brian.federle/
>
>   edit 	ui/scripts/zoneWizard.js
>
>
>     CLOUDSTACK-7764: No IP Address Validations when Adding Networks
>     Added validations for Add Network form on IPv4 Gateway, IPv4
>     Netmask, IPv4 Start IP, IPv4 End IP, IPv6 Gateway, IPv6 CIDR, IPv6
>     Start IP, IPv6 End IP fields.
>
> by /brian.federle/
>
>   edit 	ui/scripts/sharedFunctions.js
>
>
>     CLOUDSTACK-7808: Typo in Zone Creation Wizard
>
> by /brian.federle/
>
>   edit 	client/WEB-INF/classes/resources/messages.properties
>
>
>     CLOUDSTACK-7809: UI > remove unnecessary cookie 'capabilities',
>     'supportELB', 'kvmsnapshotenabled', 'regionsecondaryenabled',
>     'userpublictemplateenabled', 'userProjectsEnabled'.
>
> by /jessicawang/
>
>   edit 	ui/scripts/cloudStack.js
>
>
>     CLOUDSTACK-7809: UI > remove unnecessary cookie 'capabilities',
>     'supportELB', 'kvmsnapshotenabled', 'regionsecondaryenabled',
>     'userpublictemplateenabled', 'userProjectsEnabled'.
>
> by /jessicawang/
>
>   edit 	ui/scripts/cloudStack.js
>
>
>     Fix missing localization label
>
> by /brian.federle/
>
>   edit 	ui/scripts/network.js
>
>
>     CLOUDSTACK-7809: UI > remove unnecessary cookie 'networktype'.
>
> by /jessicawang/
>
>   edit 	ui/scripts/cloudStack.js
>
>
>     CLOUDSTACK-7809: UI > remove unnecessary cookie 'networktype'.
>
> by /jessicawang/
>
>   edit 	ui/scripts/cloudStack.js
>
>
>     CLOUDSTACK-7814: Fix default passphrase for keystores
>
> by /Sheng Yang/
>
>   edit 	utils/src/com/cloud/utils/nio/Link.java
>   edit 
> services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java 
>
>
>
>     CLOUDSTACK-7814: Fix default passphrase for keystores
>
> by /Sheng Yang/
>
>   edit 	utils/src/com/cloud/utils/nio/Link.java
>   edit 
> services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java 
>
>
>
>     CLOUDSTACK-7809: UI > remove unnecessary cookie 'timezoneoffset'.
>
> by /jessicawang/
>
>   edit 	ui/scripts/cloudStack.js
>
>
>     CLOUDSTACK-7809: UI > remove unnecessary cookie 'timezoneoffset'.
>
> by /jessicawang/
>
>   edit 	ui/scripts/cloudStack.js
>
>
>     CID-1249801 This should be a string comparison, not an object
>     comparison
>
> by /htrippaers/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java 
>
>
>
>     CID-1249800 Fix a coverity bug, but disable the code its used in as it
>
> by /htrippaers/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
>
>
>
>     CLOUDSTACK-7800: VMware - Hot plug/unplug NIC to/from VM only when
>     vmware tools are installed, else assert for exception
>
> by /talluri/
>
>   edit 	test/integration/smoke/test_nic.py
>
>
>     CID-1249803 Remove dead code
>
> by /htrippaers/
>
>   edit 
> plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java 
>
>
>
>     Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT
>
> by /htrippaers/
>
>   edit 	tools/marvin/pom.xml
>   edit 	plugins/affinity-group-processors/explicit-dedication/pom.xml
>   edit 	plugins/event-bus/inmemory/pom.xml
>   edit 	developer/pom.xml
>   edit 	plugins/affinity-group-processors/host-anti-affinity/pom.xml
>   edit 	plugins/deployment-planners/user-concentrated-pod/pom.xml
>   edit 	framework/managed-context/pom.xml
>   edit 	framework/jobs/pom.xml
>   edit 	plugins/user-authenticators/ldap/pom.xml
>   edit 	plugins/user-authenticators/plain-text/pom.xml
>   edit 	plugins/deployment-planners/implicit-dedication/pom.xml
>   edit 	plugins/storage/image/default/pom.xml
>   edit 	tools/marvin/setup.py
>   edit 	core/pom.xml
>   edit 	services/console-proxy/pom.xml
>   edit 	plugins/network-elements/cisco-vnmc/pom.xml
>   edit 	plugins/hypervisors/vmware/pom.xml
>   edit 	maven-standard/pom.xml
>   edit 	plugins/network-elements/stratosphere-ssp/pom.xml
>   edit 	services/iam/pom.xml
>   edit 	plugins/database/mysql-ha/pom.xml
>   edit 	agent/pom.xml
>   edit 	plugins/storage/volume/cloudbyte/pom.xml
>   edit 	plugins/api/rate-limit/pom.xml
>   edit 	plugins/network-elements/globodns/pom.xml
>   edit 	framework/config/pom.xml
>   edit 	plugins/host-allocators/random/pom.xml
>   edit 	vmware-base/pom.xml
>   edit 	plugins/storage/volume/sample/pom.xml
>   edit 	services/secondary-storage/pom.xml
>   edit 	engine/api/pom.xml
>   edit 	plugins/network-elements/midonet/pom.xml
>   edit 	plugins/hypervisors/simulator/pom.xml
>   edit 	plugins/storage/image/swift/pom.xml
>   edit 	plugins/alert-handlers/syslog-alerts/pom.xml
>   edit 	framework/cluster/pom.xml
>   edit 	plugins/hypervisors/kvm/pom.xml
>   edit 	plugins/network-elements/vxlan/pom.xml
>   edit 	framework/pom.xml
>   edit 	plugins/storage/volume/solidfire/pom.xml
>   edit 	pom.xml
>   edit 	plugins/user-authenticators/sha256salted/pom.xml
>   edit 	tools/checkstyle/pom.xml
>   edit 	engine/storage/snapshot/pom.xml
>   edit 	plugins/pom.xml
>   edit 	plugins/network-elements/juniper-srx/pom.xml
>   edit 	test/pom.xml
>   edit 	plugins/hypervisors/ucs/pom.xml
>   edit 	plugins/deployment-planners/user-dispersing/pom.xml
>   edit 	framework/events/pom.xml
>   edit 	plugins/network-elements/ovs/pom.xml
>   edit 	plugins/hypervisors/ovm/pom.xml
>   edit 	engine/orchestration/pom.xml
>   edit 	plugins/network-elements/brocade-vcs/pom.xml
>   edit 	plugins/network-elements/netscaler/pom.xml
>   edit 	plugins/alert-handlers/snmp-alerts/pom.xml
>   edit 	services/pom.xml
>   edit 	utils/pom.xml
>   edit 	framework/security/pom.xml
>   edit 	plugins/dedicated-resources/pom.xml
>   edit 	systemvm/pom.xml
>   edit 	server/pom.xml
>   edit 	plugins/acl/static-role-based/pom.xml
>   edit 	plugins/storage/image/sample/pom.xml
>   edit 	engine/storage/integration-test/pom.xml
>   edit 	tools/pom.xml
>   edit 	plugins/network-elements/f5/pom.xml
>   edit 	framework/rest/pom.xml
>   edit 	engine/network/pom.xml
>   edit 	plugins/network-elements/opendaylight/pom.xml
>   edit 	plugins/user-authenticators/md5/pom.xml
>   edit 	services/iam/server/pom.xml
>   edit 	services/secondary-storage/server/pom.xml
>   edit 	framework/spring/module/pom.xml
>   edit 	plugins/user-authenticators/saml2/pom.xml
>   edit 	engine/service/pom.xml
>   edit 	plugins/storage/image/s3/pom.xml
>   edit 	engine/storage/pom.xml
>   edit 	plugins/network-elements/elastic-loadbalancer/pom.xml
>   edit 	framework/ipc/pom.xml
>   edit 	engine/schema/pom.xml
>   edit 	tools/devcloud/pom.xml
>   edit 	tools/apidoc/pom.xml
>   edit 	framework/spring/lifecycle/pom.xml
>   edit 	services/console-proxy/plugin/pom.xml
>   edit 	framework/db/pom.xml
>   edit 	api/pom.xml
>   edit 	plugins/network-elements/nuage-vsp/pom.xml
>   edit 	engine/pom.xml
>   edit 	client/pom.xml
>   edit 	plugins/file-systems/netapp/pom.xml
>   edit 	tools/devcloud-kvm/pom.xml
>   edit 	plugins/storage-allocators/random/pom.xml
>   edit 	plugins/network-elements/juniper-contrail/pom.xml
>   edit 	services/console-proxy/server/pom.xml
>   edit 	plugins/hypervisors/xenserver/pom.xml
>   edit 	engine/components-api/pom.xml
>   edit 	plugins/event-bus/rabbitmq/pom.xml
>   edit 	engine/storage/datamotion/pom.xml
>   edit 	plugins/storage/volume/nexenta/pom.xml
>   edit 	engine/storage/cache/pom.xml
>   edit 	plugins/network-elements/bigswitch-vns/pom.xml
>   edit 	services/console-proxy-rdp/rdpconsole/pom.xml
>   edit 	engine/storage/image/pom.xml
>   edit 	plugins/network-elements/palo-alto/pom.xml
>   edit 	usage/pom.xml
>   edit 	plugins/network-elements/nicira-nvp/pom.xml
>   edit 	plugins/hypervisors/hyperv/pom.xml
>   edit 	engine/storage/volume/pom.xml
>   edit 	services/iam/plugin/pom.xml
>   edit 	awsapi/pom.xml
>   edit 	quickcloud/pom.xml
>   edit 	plugins/api/solidfire-intg-test/pom.xml
>   edit 	plugins/api/discovery/pom.xml
>   edit 	plugins/ha-planners/skip-heurestics/pom.xml
>   edit 	plugins/network-elements/dns-notifier/pom.xml
>   edit 	plugins/hypervisors/baremetal/pom.xml
>   edit 	tools/wix-cloudstack-maven-plugin/pom.xml
>   edit 	services/secondary-storage/controller/pom.xml
>   edit 	plugins/network-elements/internal-loadbalancer/pom.xml
>   edit 	plugins/storage/volume/default/pom.xml
>
>
>     Add database upgrade from 4.5.0 to 4.6.0
>
> by /htrippaers/
>
>   add 	engine/schema/src/com/cloud/upgrade/dao/Upgrade450to460.java
>   add 	setup/db/db/schema-450to460-cleanup.sql
>   edit 	engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
>   add 	setup/db/db/schema-450to460.sql
>
>
>     Fix a bug that prevented me from starting CS.
>
> by /htrippaers/
>
>   edit 
> framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java 
>
>
>
>     CLOUDSTACK-7765: Field Validations Missing for VPC IP Address Fields
>
> by /brian.federle/
>
>   edit 	ui/scripts/network.js
>   edit 	ui/scripts/sharedFunctions.js
>
>
>     CLOUDSTACK-7766: Field Validations Missing for Ingress and Egress
>     Rules
>
> by /brian.federle/
>
>   edit 	ui/scripts/ui/widgets/multiEdit.js
>   edit 	ui/scripts/network.js
>
>
>     Project dashboard: Fix user label overflow
>
> by /brian.federle/
>
>   edit 	ui/scripts/ui-custom/projects.js
>   edit 	ui/css/cloudstack3.css
>
>
>     CLOUDSTACK-7809: UI > remove usage of g_mySession which is
>     unnecessary.
>
> by /jessicawang/
>
>   edit 	ui/scripts/sharedFunctions.js
>   edit 	ui/scripts/cloudStack.js
>
>
>     CLOUDSTACK-7809: UI > remove usage of g_mySession which is
>     unnecessary.
>
> by /jessicawang/
>
>   edit 	ui/scripts/sharedFunctions.js
>   edit 	ui/scripts/cloudStack.js
>
>
>     CLOUDSTACK-7660: Enhance system vm template to support baremetal
>     Installed Package flask and merged the disk partition
>
> by /frank.zhang/
>
>   edit 	tools/appliance/definitions/systemvmtemplate/preseed.cfg
>
>
>     there is no transaction context during the mgt server start, thus
>     causing transaction.close will delete op_lock table if
>     aquireinlocktable is called Reviewed-by: Anthony and Min
>
> by /sudison/
>
>   edit 	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
>
>
>     MTU should be put on storage network: eth3, instead of eth1
>     Reviewed-by: Frank
>
> by /sudison/
>
>   edit 	systemvm/patches/debian/config/etc/init.d/cloud-early-config
>
>
>     fixed NPE
>
> by /anthony.xu/
>
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>
>
>     CLOUDSTACK-7688, CLOUDSTACK-7747: restricted various operations
>     for VM with VM snapshots which breaks VM snapshots.
>
> by /anshul.gangwar/
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
>
>
>     CLOUDSTACK-7767: fixed events are not generated for snapshot creation
>
> by /anshul.gangwar/
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>
>
>     Revert "CLOUDSTACK-7408: Fixed - Private key of the ssh keypair
>     was getting corrupted"
>
> by /talluri/
>
>   edit 	tools/marvin/marvin/lib/base.py
>   edit 	tools/marvin/marvin/sshClient.py
>   edit 	tools/marvin/marvin/lib/utils.py
>
>
>     CLOUDSTACK-7805: test_vpc_vms_deployment.py - Removing invalid
>     steps from test case
>
> by /talluri/
>
>   edit 	test/integration/component/test_vpc_vms_deployment.py
>
>
>     CLOUDSTACK-7802: test_vpc_network.py - Increasing polling period
>     for network state check
>
> by /talluri/
>
>   edit 	test/integration/component/test_vpc_network.py
>
>
>     CLOUDSTACK-7801: test_volumes.py - Fixed import and pep8 issues
>
> by /talluri/
>
>   edit 	test/integration/component/test_volumes.py
>
>
>     CLOUDSTACK-7685: Fixed copy template method call in
>     test_escalations_template.py. Removed unbound method of the same
>     name as bound method from base library and changed method call
>     accordingly
>
> by /talluri/
>
>   edit 	tools/marvin/marvin/lib/base.py
>   edit 	test/integration/component/test_escalations_templates.py
>
>
>     CLOUDSTACK-7682: Fixed usage event issue. Used api client of
>     account for which we are checking the usage
>
> by /talluri/
>
>   edit 	test/integration/component/test_usage.py
>
>
>     CLOUDSTACK-7684: Fixed Exception not raised issue in secondary
>     storage limits test suite test_ss_max_limits.py
>
> by /talluri/
>
>   edit 	test/integration/component/test_ss_max_limits.py
>
>
>     CLOUDSTACK-7691: Fixed 'Exception not raised' issue in
>     test_project_limits.py
>
> by /talluri/
>
>   edit 	test/integration/component/test_project_limits.py
>
>
>     CLOUDSTACK-7692: Fixed template register issue in
>     test_project_usage.py
>
> by /talluri/
>
>   edit 	test/integration/component/test_project_usage.py
>
>
>     CLOUDSTACK-7728: Test script to identify product issue
>
> by /talluri/
>
>   edit 	test/integration/component/test_egress_fw_rules.py
>
>
>     CLOUDSTACK-7632:Automation for volume life cycle testPath
>
> by /talluri/
>
>   edit 	test/integration/testpaths/testpath_volumelifecycle.py
>
>
>     CLOUDSTACK-7646 Move the nuage test out of smoke as it depends on
>     noredist components
>
> by /htrippaers/
>
>   add 	test/integration/component/test_nuage_vsp.py
>   delete 	test/integration/smoke/test_nuage_vsp.py
>
>
>     CLOUDSTACK-7646 Move the nuage test out of smoke as it depends on
>     noredist components
>
> by /htrippaers/
>
>   add 	test/integration/component/test_nuage_vsp.py
>   delete 	test/integration/smoke/test_nuage_vsp.py
>
>
>     don't need to check if pv driver is updated, old pv driver should work
>
> by /anthony.xu/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java 
>
>
>
>     CLOUDSTACK-7816: UI > Global Settings > add "Baremetal Rack
>     Configuration" section.
>
> by /jessicawang/
>
>   edit 	ui/scripts/globalSettings.js
>
>
>     should not duplicate vm instance id, during the volume migration
>
> by /sudison/
>
>   edit 	engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>
>
>     CLOUDSTACK-7816: UI > Global Settings > add "Baremetal Rack
>     Configuration" section.
>
> by /jessicawang/
>
>   edit 	ui/scripts/globalSettings.js
>
>
>     saml: Use camelCase api names for SAML login/logout apis
>
> by /rohit.yadav/
>
>   edit 
> plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java 
>
>   edit 	server/src/com/cloud/configuration/Config.java
>   edit 
> plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java 
>
>   edit 	client/tomcatconf/commands.properties.in
>
>
>     SAMLUtils: SAML user id should fit within the UUID VARCHAR(40) column
>
> by /rohit.yadav/
>
>   edit 	utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
>
>
>     saml: Use camelCase api names for SAML login/logout apis
>
> by /rohit.yadav/
>
>   edit 
> plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java 
>
>   edit 	server/src/com/cloud/configuration/Config.java
>   edit 
> plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java 
>
>   edit 	client/tomcatconf/commands.properties.in
>
>
>     SAMLUtils: SAML user id should fit within the UUID VARCHAR(40) column
>
> by /rohit.yadav/
>
>   edit 	utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
>
>
>     new managed nfs storage adapter
>
> by /mike.tutkowski/
>
>   edit 	api/src/com/cloud/agent/api/to/DiskTO.java
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java 
>
>   edit 	api/src/com/cloud/storage/Storage.java
>   add 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java 
>
>
>
>     CLOUDSTACK-7820: Don't consider disabled hosts for calculating
>     disable threshold.
>
> by /nitin.mehta/
>
>   edit 	engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
>
>
>     CLOUDSTACK-7820: Don't consider disabled hosts for calculating
>     disable threshold.
>
> by /nitin.mehta/
>
>   edit 	engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
>
>
>     CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly
>     declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC
>
> by /Sheng Yang/
>
>   edit 	systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
>
>
>     CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly
>     declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC
>
> by /Sheng Yang/
>
>   edit 	systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
>
>
>     CLOUDSTACK-7824: using debian 7.7.0 and
>
> by /talluri/
>
>   edit 	tools/appliance/definitions/systemvmtemplate/definition.rb
>   edit 
> tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
>
>
>     CLOUDSTACK-7824: using debian 7.7.0 for systemvm template
>
> by /talluri/
>
>   edit 	tools/appliance/definitions/systemvm64template/definition.rb
>   edit 	tools/appliance/definitions/systemvmtemplate/definition.rb
>
>
>     CLOUDSTACK-7660: Enhance system vm template to support baremetal
>
> by /talluri/
>
>   edit 	tools/appliance/definitions/systemvmtemplate/preseed.cfg
>   edit 
> tools/appliance/definitions/systemvmtemplate/install_systemvm_packages.sh
>
>
>     CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests
>
> by /pdion891/
>
>   edit 	server/test/resources/certs/rsa_ca_signed.crt
>   edit 	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
>   edit 	server/test/resources/certs/rsa_ca_signed.key
>   edit 	server/test/resources/certs/rsa_self_signed.key
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.key
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.crt
>   edit 	server/test/resources/certs/rsa_self_signed.crt
>
>
>     CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests
>
> by /pdion891/
>
>   edit 	server/test/resources/certs/rsa_ca_signed.crt
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.key
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.crt
>   edit 	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
>   edit 	server/test/resources/certs/rsa_ca_signed.key
>   edit 	server/test/resources/certs/rsa_self_signed.crt
>   edit 	server/test/resources/certs/rsa_self_signed.key
>
>
>     Revert "CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests"
>
> by /pdion891/
>
>   edit 	server/test/resources/certs/rsa_self_signed.crt
>   edit 	server/test/resources/certs/rsa_ca_signed.key
>   edit 	server/test/resources/certs/rsa_ca_signed.crt
>   edit 	server/test/resources/certs/rsa_self_signed.key
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.key
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.crt
>   edit 	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
>
>
>     Revert "CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests"
>
> by /pdion891/
>
>   edit 	server/test/resources/certs/rsa_ca_signed.crt
>   edit 	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
>   edit 	server/test/resources/certs/rsa_self_signed.key
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.key
>   edit 	server/test/resources/certs/rsa_self_signed.crt
>   edit 	server/test/resources/certs/rsa_ca_signed.key
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.crt
>
>
>     Fixed root disk resize on deploy for RBD.
>
> by /wido/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java 
>
>
>
>     CLOUDSTACK-7825: Report both virtual size and physical size for
>     the snaphost usage event.
>
> by /nitin.mehta/
>
>   edit 	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
>
>
>     CLOUDSTACK-7825: Report both virtual size and physical size for
>     the snaphost usage event.
>
> by /nitin.mehta/
>
>   edit 	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
>
>
>     CLOUDSTACK:6915 search including removed
>
> by /amogh.vasekar/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
>   edit 	server/src/com/cloud/hypervisor/KVMGuru.java
>   edit 	server/src/com/cloud/hypervisor/LXCGuru.java
>
>
>     CLOUDSTACK-7826: UI - dialog widget - dependent dropdown field
>     (dependsOn property specified) - fix a bug that default opton in
>     dependent dropdown field didn't trigger change event handler until
>     another option in dependent dropdown field was selected.
>
> by /jessicawang/
>
>   edit 	ui/scripts/ui/dialog.js
>
>
>     CLOUDSTACK-7826: UI - dialog widget - dependent dropdown field
>     (dependsOn property specified) - fix a bug that default opton in
>     dependent dropdown field didn't trigger change event handler until
>     another option in dependent dropdown field was selected.
>
> by /jessicawang/
>
>   edit 	ui/scripts/ui/dialog.js
>
>
>     CLOUDSTACK:6915 search including removed
>
> by /amogh.vasekar/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
>   edit 	server/src/com/cloud/hypervisor/LXCGuru.java
>   edit 	server/src/com/cloud/hypervisor/KVMGuru.java
>
>
>     CLOUDSTACK-7748: Cloudstack version number is missing in system vm
>     template. /etc/cloudstack-release in system vm does not have
>     version number which leads in vm deployment failure while checking
>     router version.
>
> by /kishan/
>
>   edit 	tools/appliance/build.sh
>   edit 
> tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh 
>
>
>
>     CLOUDSTACK-7828.Avoid marking IPs already in Allocated as
>     Allocated again. Use row lock to ensure that prev state is either
>     Allocating or Free. This will inturn avoid logging duplicate events
>
> by /santhosh.edukulla/
>
>   edit 	server/src/com/cloud/network/IpAddressManagerImpl.java
>
>
>     Bump debian package version to 4.6.0-SNAPSHOT as well
>
> by /htrippaers/
>
>   edit 	debian/changelog
>
>
>     Fixed Coverity Issues
>
> by /santhosh.edukulla/
>
>   edit 
> services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java 
>
>   edit 	core/src/com/cloud/network/resource/TrafficSentinelResource.java
>   edit 	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java 
>
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java 
>
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java 
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 	server/src/org/apache/cloudstack/region/RegionsApiUtil.java
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java 
>
>
>
>     CLOUDSTACK-7253: For LXC Vms, show unsupported error for console
>     access
>
> by /kishan/
>
>   edit 	server/src/com/cloud/servlet/ConsoleProxyServlet.java
>
>
>     CLOUDSTACK-7265: For LXC volumes, show unsupported operation error
>     for volume snapshot
>
> by /kishan/
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>
>
>     CLOUDSTACK-7267: For LXC volumes, show unsupported operation error
>     for template creation from ROOT volume
>
> by /kishan/
>
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>
>
>     CLOUDSTACK-7832: Move some job db update and item purge to
>
> by /min.chen/
>
>   edit 	framework/db/src/com/cloud/utils/db/Transaction.java
>   edit 
> framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>   edit 	framework/ipc/pom.xml
>
>
>     CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock
>     for the key vm_instance" errors as warning
>
> by /min.chen/
>
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>   edit 	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
>
>
>     CLOUDSTACK-7832: Move some job db update and item purge to
>
> by /min.chen/
>
>   edit 	framework/ipc/pom.xml
>   edit 
> framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java 
>
>   edit 	framework/db/src/com/cloud/utils/db/Transaction.java
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock
>     for the key vm_instance" errors as warning
>
> by /min.chen/
>
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>   edit 	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     if attach volume fails, destroy the VBD device
>
> by /anthony.xu/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java 
>
>
>
>     systemvm: Prefer TLS over SSL in apache, POODLE workaround
>     (CVE­2014­3566)
>
> by /rohit.yadav/
>
>   edit 	systemvm/patches/debian/config/etc/apache2/httpd.conf
>
>
>     systemvm: Prefer TLS over SSL in apache, POODLE workaround
>     (CVE­2014­3566)
>
> by /rohit.yadav/
>
>   edit 	systemvm/patches/debian/config/etc/apache2/httpd.conf
>
>
>     CLOUDSTACK-3608 removing duplicate entries, IDs not saved anywhere
>     else hence safe to remove
>
> by /amogh.vasekar/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     CLOUDSTACK-3608 remove duplicate entries
>
> by /amogh.vasekar/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     CLOUDSTACK-3212: ui > infrastructure > zones > zone > physical
>     network > guest > network > guest ip range - listview: add
>     gateway, netmask field.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-3212: ui > infrastructure > zones > zone > physical
>     network > guest > network > guest ip range - listview: add
>     gateway, netmask field.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7834
>
> by /frank.zhang/
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java 
>
>
>
>     CLOUDSTACK-7834
>
> by /frank.zhang/
>
>   edit 
> plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalDhcpCmd.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/org/apache/cloudstack/api/ListBaremetalPxeServersCmd.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java 
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java 
>
>
>
>     remove duplicate import
>
> by /frank.zhang/
>
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java 
>
>
>
>     CLOUDSTACK-7632:Automation for volume life cycle testPath
>
> by /talluri/
>
>   edit 	test/integration/testpaths/testpath_volumelifecycle.py
>
>
>     CLOUDSTACK-7728: Test script to identify product issue
>
> by /talluri/
>
>   edit 	test/integration/component/test_egress_fw_rules.py
>
>
>     CLOUDSTACK-7692: Fixed template register issue in
>     test_project_usage.py
>
> by /talluri/
>
>   edit 	test/integration/component/test_project_usage.py
>
>
>     CLOUDSTACK-7691: Fixed 'Exception not raised' issue in
>     test_project_limits.py
>
> by /talluri/
>
>   edit 	test/integration/component/test_project_limits.py
>
>
>     CLOUDSTACK-7684: Fixed Exception not raised issue in secondary
>     storage limits test suite test_ss_max_limits.py
>
> by /talluri/
>
>   edit 	test/integration/component/test_ss_max_limits.py
>
>
>     CLOUDSTACK-7682: Fixed usage event issue. Used api client of
>     account for which we are checking the usage
>
> by /talluri/
>
>   edit 	test/integration/component/test_usage.py
>
>
>     CLOUDSTACK-7802: test_vpc_network.py - Increasing polling period
>     for network state check
>
> by /talluri/
>
>   edit 	test/integration/component/test_vpc_network.py
>
>
>     CLOUDSTACK-7801: test_volumes.py - Fixed import and pep8 issues
>
> by /talluri/
>
>   edit 	test/integration/component/test_volumes.py
>
>
>     CLOUDSTACK-7685: Fixed copy template method call in
>     test_escalations_template.py. Removed unbound method of the same
>     name as bound method from base library and changed method call
>     accordingly
>
> by /talluri/
>
>   edit 	test/integration/component/test_escalations_templates.py
>   edit 	tools/marvin/marvin/lib/base.py
>
>
>     CLOUDSTACK-7805: test_vpc_vms_deployment.py - Removing invalid
>     steps from test case
>
> by /talluri/
>
>   edit 	test/integration/component/test_vpc_vms_deployment.py
>
>
>     Revert "CLOUDSTACK-7408: Fixed - Private key of the ssh keypair
>     was getting corrupted"
>
> by /talluri/
>
>   edit 	tools/marvin/marvin/sshClient.py
>   edit 	tools/marvin/marvin/lib/base.py
>   edit 	tools/marvin/marvin/lib/utils.py
>
>
>     CLOUDSTACK-7800: VMware - Hot plug/unplug NIC to/from VM only when
>     vmware tools are installed, else assert for exception
>
> by /talluri/
>
>   edit 	test/integration/smoke/test_nic.py
>
>
>     CVE­2014­3566: Avoid using SSLv3 on apache2 webserver used by SSVM
>
> by /rohit.yadav/
>
>   edit 
> tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh 
>
>
>
>     CVE­2014­3566: Avoid using SSLv3 on apache2 webserver used by SSVM
>
> by /rohit.yadav/
>
>   edit 	tools/appliance/definitions/systemvm64template/postinstall.sh
>   edit 	tools/appliance/definitions/systemvmtemplate/postinstall.sh
>
>
>     CLOUDSTACK-7372: [vGPU] When a host is put in maintenance mode,
>     vGPU enabled VMs
>
> by /sanjay.tripathi/
>
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>
>
>     CLOUDSTACK-7835: Deleted volumes with null UUID and no removed
>     timestamp in database still appear.
>
> by /sanjay.tripathi/
>
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>   edit 	api/src/com/cloud/storage/Volume.java
>
>
>     CLOUDSTACK-7372: [vGPU] When a host is put in maintenance mode,
>     vGPU enabled VMs
>
> by /sanjay.tripathi/
>
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>
>
>     CLOUDSTACK-7421
>
> by /koushik/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 	server/src/com/cloud/api/ApiAsyncJobDispatcher.java
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>
>
>     CLOUDSTACK-7835: Deleted volumes with null UUID and no removed
>     timestamp in database still appear.
>
> by /sanjay.tripathi/
>
>   edit 	api/src/com/cloud/storage/Volume.java
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>
>
>     CLOUDSTACK-7384: UI > Instances > detailView > change service
>     offering option > hide it when VM state is Running and hyperviror
>     is LXC.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instances.js
>
>
>     CLOUDSTACK-7384: UI > Instances > detailView > change service
>     offering option > hide it when VM state is Running and hyperviror
>     is LXC.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instances.js
>
>
>     CLOUDSTACK-7720: No IP Address Validation for Acquire new secondary IP
>
> by /brian.federle/
>
>   edit 	ui/scripts/network.js
>
>
>     CLOUDSTACK-7838: UI - Update category names on Resources tab of a
>     Zone -Changed wording: "Storage" -> "Primary Storage Used", "CPU"
>     -> "CPU allocated", Memory -> "Memory Allocated"
>
> by /brian.federle/
>
>   edit 	ui/scripts/ui-custom/zoneChart.js
>
>
>     CLOUDSTACK-7840: UI control tip for 'Add Primary Storage' ->
>     'Provider' seems wrong
>
> by /brian.federle/
>
>   edit 	ui/scripts/system.js
>
>
>     Fixes: [UI] Added missing label to properties.file.
>
> by /brian.federle/
>
>   edit 	ui/dictionary2.jsp
>   edit 	client/WEB-INF/classes/resources/messages.properties
>
>
>     CLOUDSTACK-7645
>
> by /brian.federle/
>
>   edit 	ui/scripts/configuration.js
>   edit 	ui/dictionary2.jsp
>
>
>     CLOUDSTACK-7383: UI > Instances > detailView > snapshot option >
>     hide this option when hypervisor is LXC.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instances.js
>
>
>     CLOUDSTACK-7383: UI > Instances > detailView > snapshot option >
>     hide this option when hypervisor is LXC.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instances.js
>
>
>     CLOUDSTACK-7841: Gracefully reload haproxy config
>
> by /Sheng Yang/
>
>   edit 	systemvm/patches/debian/config/root/reconfigLB.sh
>
>
>     CLOUDSTACK-7841: Gracefully reload haproxy config
>
> by /Sheng Yang/
>
>   edit 	systemvm/patches/debian/config/root/reconfigLB.sh
>
>
>     Fixed CLOUDSTACK-7242: Adding a securing config using configDepo
>     doesnt work
>
> by /rajanikaruturi/
>
>   edit 
> framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java 
>
>   edit 	server/src/com/cloud/server/ConfigurationServerImpl.java
>   edit 
> framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java 
>
>
>
>     CLOUDSTACK-7800: Correcting code related to unplug NIC on VMware
>
> by /talluri/
>
>   edit 	test/integration/smoke/test_nic.py
>
>
>     CLOUDSTACK-7800: Correcting code related to unplug NIC on VMware
>
> by /talluri/
>
>   edit 	test/integration/smoke/test_nic.py
>
>
>     CLOUDSTACK-7837: [UI] Make the Source CIDR column wide enough to
>     fit the CIDR value without ellipsizing
>
> by /rajanikaruturi/
>
>   edit 	ui/css/cloudstack3.css
>
>
>     CLOUDSTACK-7842: Wrong size column is getting updated with
>     snapshot physical size in snapshot_store_ref table.
>
> by /sanjay.tripathi/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java 
>
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java 
>
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java 
>
>   edit 	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
>   edit 	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
>
>
>     CLOUDSTACK-7842: wrong size column is getting updated with
>     snapshot physical size in snapshot_store_ref table.
>
> by /sanjay.tripathi/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java 
>
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java 
>
>   edit 	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
>   edit 	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java 
>
>
>
>     CLOUDSTACK-7822: merge, test sslcert ca
>
> by /pdion891/
>
>   add 	server/test/resources/certs/root_chain.key
>   edit 	server/test/resources/certs/root_chain.crt
>   edit 	server/test/resources/certs/rsa_ca_signed2.crt
>
>
>     commented broken unit test
>
> by /pdion891/
>
>   edit 	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
>
>
>     CLOUDSTACK-7822: fix tests CA cert
>
> by /pdion891/
>
>   edit 	server/test/resources/certs/rsa_ca_signed2.crt
>   add 	server/test/resources/certs/root_chain.key
>   edit 	server/test/resources/certs/root_chain.crt
>
>
>     CLOUDSTACK-7850: UI > Instances > detailView > Attach ISO option >
>     ISO dropdown > should list only ISOs belonging to the same zone.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instances.js
>
>
>     CLOUDSTACK-7850: UI > Instances > detailView > Attach ISO option >
>     ISO dropdown > should list only ISOs belonging to the same zone.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instances.js
>
>
>     Fixed coverity issue
>
> by /rajanikaruturi/
>
>   edit 
> plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java 
>
>
>
>     Sorting projects alphabetically in drop down menu
>
> by /rajanikaruturi/
>
>   edit 	ui/scripts/ui-custom/projectSelect.js
>
>
>     CLOUDSTACK-7852: EN-US, SC: CentOS CLI & Windows OS: Key translation
>
> by /sanjay.tripathi/
>
>   edit 	systemvm/js/ajaxviewer.js
>
>
>     CLOUDSTACK-7852: EN-US, SC: CentOS CLI & Windows OS: Key translation
>
> by /sanjay.tripathi/
>
>   edit 	systemvm/js/ajaxviewer.js
>
>
>     CLOUDSTACK-7854: Don't have CentOS 5.3 built-in template when
>     we've 5.6
>
> by /rohit.yadav/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     CLOUDSTACK-7854: Don't have CentOS 5.3 built-in template when
>     we've 5.6
>
> by /rohit.yadav/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     CLOUDSTACK-7855: NIC3 should set MTU and not NIC1 for storage
>     network nic
>
> by /rohit.yadav/
>
>   edit 	systemvm/patches/debian/config/etc/init.d/cloud-early-config
>
>
>     CLOUDSTACK-7855: NIC3 should set MTU and not NIC1 for storage
>     network nic
>
> by /rohit.yadav/
>
>   edit 	systemvm/patches/debian/config/etc/init.d/cloud-early-config
>
>
>     commented unit tests for CertService until certs issues fixed
>
> by /pdion891/
>
>   edit 	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
>
>
>     CLOUDSTACK-7854: Don't remove vm_template row for centos 5.5, mark
>     as removed
>
> by /rohit.yadav/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     CLOUDSTACK-7854: Don't remove vm_template row for centos 5.5, mark
>     as removed
>
> by /rohit.yadav/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     Create a template from a SAN snapshot
>
> by /mike.tutkowski/
>
>   edit 
> engine/storage/datamotion/resources/META-INF/cloudstack/storage/spring-engine-storage-datamotion-storage-context.xml 
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java 
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java 
>
>   edit 
> engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java 
>
>   edit 	core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>   edit 
> engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java 
>
>
>
>     Handle the case where a snapshot is associated with a deleted volume
>
> by /mike.tutkowski/
>
>   edit 
> engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java 
>
>   edit 	server/src/com/cloud/api/ApiResponseHelper.java
>
>
>     CLOUDSTACK-7683: hold a db lock during vm expunge
>
> by /sudison/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>
>
>     CS-27148 system vm image build process, needs to build an old
>     version of qemu image, otherwise, it won't work on RHEL 6
>     Reviewed-by:Frank
>
> by /sudison/
>
>   edit 	tools/appliance/build.sh
>
>
>     There are few cases that mgt server won't reponse agent's
>     pingcommand timely, or in KVM's case, libvirt won't repsonse in
>     few mintues, which will cause agent reconnect to mgt server, then
>     all the on going tasks on host will fail
>
> by /sudison/
>
>   edit 	agent/src/com/cloud/agent/Agent.java
>
>
>     fix kvm issue, for windows sever 2008, it will crash without
>     hyperv enlightment featre enabled
>
> by /sudison/
>
>   edit 
> plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java 
>
>
>
>     CS-21296: hidden snapshot.backup.rightafter, as it's not needed
>
> by /sudison/
>
>   edit 	server/src/com/cloud/configuration/Config.java
>
>
>     fix kvm agent upgrade issue: kvm agent needs to use java 7 instead
>     of java 6 after upgrade Reviewed-by: Sheng
>
> by /sudison/
>
>   edit 	agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in
>
>
>     there is no transaction context during the mgt server start, thus
>     causing transaction.close will delete op_lock table if
>     aquireinlocktable is called Reviewed-by: Anthony and Min
>
> by /sudison/
>
>   edit 	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
>
>
>     should not duplicate vm instance id, during the volume migration
>
> by /sudison/
>
>   edit 	engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>
>
>     CLOUDSTACK-7683: hold a db lock during vm expunge
>
> by /sudison/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>
>
>     system vm image build process, needs to build an old version of
>     qemu image, otherwise, it won't work on RHEL 6
>
> by /sudison/
>
>   edit 	tools/appliance/build.sh
>
>
>     Handle the case where the volume a snapshot was created from is
>     removed from the database
>
> by /mike.tutkowski/
>
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>   edit 	server/src/com/cloud/api/ApiResponseHelper.java
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>
>
>     Check to see if the Map<String, String> of capabilities passed
>     back from the storage driver is null.
>
> by /mike.tutkowski/
>
>   edit 	server/src/com/cloud/api/ApiResponseHelper.java
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>
>
>     Allow infrastructure to handle delete of volume from DB
>
> by /mike.tutkowski/
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java 
>
>
>
>     Allow infrastructure to handle delete of volume from DB
>
> by /mike.tutkowski/
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java 
>
>
>
>     CLOUDSTACK-7859: Host tags are not getting removed in
>     cloud.host_tags table when a Host is deleted from CS.
>
> by /sanjay.tripathi/
>
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>   edit 	engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java
>   edit 	engine/schema/src/com/cloud/host/dao/HostTagsDao.java
>
>
>     CLOUDSTACK-7859: Host tags are not getting removed in
>     cloud.host_tags table when a Host is deleted from CS.
>
> by /sanjay.tripathi/
>
>   edit 	engine/schema/src/com/cloud/host/dao/HostTagsDao.java
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>   edit 	engine/schema/src/com/cloud/host/dao/HostTagsDaoImpl.java
>
>
>     Allow infrastructure to handle delete of volume from DB
>
> by /mike.tutkowski/
>
>   edit 
> plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java 
>
>
>
>     Allow infrastructure to handle delete of volume from DB
>
> by /mike.tutkowski/
>
>   edit 
> plugins/storage/volume/cloudbyte/src/org/apache/cloudstack/storage/datastore/driver/ElastistorPrimaryDataStoreDriver.java 
>
>
>
>     BUG-ID: CS-27191: CPVM continues to be in Stopped state after a
>     failure
>
> by /min.chen/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDao.java 
>
>
>
>     Revert "BUG-ID: CS-27191: CPVM continues to be in Stopped state
>     after a failure"
>
> by /min.chen/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDao.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java 
>
>
>
>     CLOUDSTACK-7864: CPVM continues to be in Stopped state after a
>     failure to start because of a management server restart.
>
> by /min.chen/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDao.java 
>
>
>
>     CLOUDSTACK-7864: CPVM continues to be in Stopped state after a
>     failure to start because of a management server restart.
>
> by /min.chen/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/AsyncJobDao.java 
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     CLOUDSTACK-7868: Failed storage.PrimaryStorageDownloadCommand
>     leaves corrupt VDIs in primary storage.
>
> by /sanjay.tripathi/
>
>   edit 	scripts/vm/hypervisor/xenserver/vmopspremium
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>
>
>     CLOUDSTACK-7868: Failed storage.PrimaryStorageDownloadCommand
>     leaves corrupt VDIs in primary storage.
>
> by /sanjay.tripathi/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>   edit 	scripts/vm/hypervisor/xenserver/vmopspremium
>
>
>     CLOUDSTACK-7867: Delete network resulting in exception
>
> by /koushik/
>
>   edit 
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java 
>
>
>
>     CLOUDSTACK-7869: Add simulator support for findHostsForMigration API
>
> by /koushik/
>
>   edit 	server/src/com/cloud/server/ManagementServerImpl.java
>
>
>     CLOUDSTACK-7421
>
> by /koushik/
>
>   edit 	server/src/com/cloud/api/ApiAsyncJobDispatcher.java
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>
>
>     CLOUDSTACK-7867: Delete network resulting in exception
>
> by /koushik/
>
>   edit 
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java 
>
>
>
>     CLOUDSTACK-7869: Add simulator support for findHostsForMigration API
>
> by /koushik/
>
>   edit 	server/src/com/cloud/server/ManagementServerImpl.java
>
>
>     Logrotate is called from crontab. Debian crontab does not include
>     everything in it's path. Therefore reference to these bins need to
>     be absoluut.
>
> by /daan/
>
>   edit 	systemvm/patches/debian/config/etc/logrotate.d/rsyslog
>   edit 	systemvm/patches/debian/config/etc/logrotate.d/conntrackd
>   edit 	systemvm/patches/debian/config/etc/logrotate.d/cloud
>
>
>     Logrotate is called from crontab. Debian crontab does not include
>     everything in it's path. Therefore reference to these bins need to
>     be absoluut.
>
> by /daan/
>
>   edit 	systemvm/patches/debian/config/etc/logrotate.d/conntrackd
>   edit 	systemvm/patches/debian/config/etc/logrotate.d/cloud
>   edit 	systemvm/patches/debian/config/etc/logrotate.d/rsyslog
>
>
>     CLOUDSTACK-7870: When Vm deployments fail and end in error state
>     volume count should be decremented
>
> by /nitin.mehta/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java 
>
>
>
>     CLOUDSTACK-7721. Runtime exception while trying to release lock on
>     template_spool_ref.
>
> by /devdeep/
>
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>
>
>     CLOUDSTACK-7763 Reservations for VMware VMs remain after dynamic
>     scaling
>
> by /kishan/
>
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java 
>
>
>
>     CLOUDSTACK-7760 Data disk size is not considering for primary
>     storage resource limit check
>
> by /kishan/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>
>
>     CLOUDSTACK-7851:MS does not start after the VM it is running on is
>     rebooted
>
> by /kishan/
>
>   edit 	packaging/centos63/cloud-management.rc
>
>
>     CLOUDSTACK-7843: sync Job Failures always reported as success on
>     Event Bus
>
> by /kishan/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     Normalize some error message strings to make maintenance (i.e.,
>     changing said error messages) a bit easier.
>
> by /rajanikaruturi/
>
>   edit 	engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
>
>
>     CLOUDSTACK-7763 Reservations for VMware VMs remain after dynamic
>     scaling
>
> by /kishan/
>
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java 
>
>
>
>     CLOUDSTACK-7760 Data disk size is not considering for primary
>     storage resource limit check
>
> by /kishan/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>
>
>     CLOUDSTACK-7851:MS does not start after the VM it is running on is
>     rebooted
>
> by /kishan/
>
>   edit 	packaging/centos63/cloud-management.rc
>
>
>     CLOUDSTACK-7843: sync Job Failures always reported as success on
>     Event Bus
>
> by /kishan/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     CLOUDSTACK-7830: Usage Job fails with "Data too long for column
>     'user_name'"
>
> by /kishan/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     CLOUDSTACK-7830: Usage Job fails with "Data too long for column
>     'user_name'"
>
> by /kishan/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     CLOUDSTACK-7792: Usage Events to be captured based on Volume State
>     Machine
>
> by /kishan/
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>   edit 	api/src/com/cloud/vm/VirtualMachine.java
>   edit 	engine/schema/src/com/cloud/storage/VolumeVO.java
>   edit 
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java 
>
>   edit 	api/src/com/cloud/storage/Volume.java
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java 
>
>   edit 	server/src/com/cloud/storage/listener/VolumeStateListener.java
>   edit 	server/src/com/cloud/storage/StorageManagerImpl.java
>   edit 
> engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java 
>
>
>
>     CLOUDSTACK-7872: network getting shutdown inspite of running VM's
>     in the network
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/network/NetworkModelImpl.java
>   edit 	engine/schema/src/com/cloud/vm/dao/NicDao.java
>   edit 	engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
>   edit 	engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
>
>
>     Add check to ensure VR template version matches digit.digit.digit
>     format. Returns version as 0 otherwise
>
> by /kishan/
>
>   edit 	utils/src/com/cloud/maint/Version.java
>
>
>     CLOUDSTACK-7872: network getting shutdown inspite of running VM's
>     in the network
>
> by /jayapal/
>
>   edit 	engine/schema/src/com/cloud/vm/dao/NicDao.java
>   edit 	engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
>   edit 	engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
>   edit 	server/src/com/cloud/network/NetworkModelImpl.java
>
>
>     CLOUDSTACK-7866: Passing type value to list_hosts method so as to
>     avoid listing SSVM and CPVM
>
> by /talluri/
>
>   edit 	test/integration/component/maint/test_host_high_availability.py
>
>
>     CLOUDSTACK-7866: Passing type value to list_hosts method so as to
>     avoid listing SSVM and CPVM
>
> by /talluri/
>
>   edit 	test/integration/component/maint/test_host_high_availability.py
>
>
>     CLOUDSTACK-7863: Fix the script 'test_vpc_vms_deployment.py' -
>     Test Cases failing on Simulator as Testcases try to ssh to the VMs
>
> by /talluri/
>
>   edit 	test/integration/component/test_vpc_vms_deployment.py
>
>
>     CLOUDSTACK-7863: Fix the script 'test_vpc_vms_deployment.py' -
>     Test Cases failing on Simulator as Testcases try to ssh to the VMs
>
> by /talluri/
>
>   edit 	test/integration/component/test_vpc_vms_deployment.py
>
>
>     CLOUDSTACK-7862: Fixed the script
>     'maint/test_high_availability.py' - Test Cases failing on
>     Simulator as Testcases try to ssh to the VMs
>
> by /talluri/
>
>   edit 	test/integration/component/maint/test_high_availability.py
>
>
>     CLOUDSTACK-7862: Fixed the script
>     'maint/test_high_availability.py' - Test Cases failing on
>     Simulator as Testcases try to ssh to the VMs
>
> by /talluri/
>
>   edit 	test/integration/component/maint/test_high_availability.py
>
>
>     CLOUDSTACK-7856: test_vpc_network_pf_rules.py - Check if httpd
>     service is running or not, if not, start it
>
> by /talluri/
>
>   edit 	test/integration/component/test_vpc_network_pfrules.py
>
>
>     CLOUDSTACK-7856: test_vpc_network_pf_rules.py - Check if httpd
>     service is running or not, if not, start it
>
> by /talluri/
>
>   edit 	test/integration/component/test_vpc_network_pfrules.py
>
>
>     CLOUDSTACK-7823: test_snapshots.py - remove test case dependency
>     on each other
>
> by /talluri/
>
>   edit 	test/integration/component/test_snapshots.py
>
>
>     CLOUDSTACK-7823: test_snapshots.py - remove test case dependency
>     on each other
>
> by /talluri/
>
>   edit 	test/integration/component/test_snapshots.py
>
>
>     CLOUDSTACK-7818: Fixing test_escalations_instances.py, Removing
>     dependency of test cases on each other
>
> by /talluri/
>
>   edit 	test/integration/component/test_escalations_instances.py
>
>
>     CLOUDSTACK-7818: Fixing test_escalations_instances.py, Removing
>     dependency of test cases on each other
>
> by /talluri/
>
>   edit 	test/integration/component/test_escalations_instances.py
>
>
>     CLOUDSTACK-7871: allow VM and template details update using update
>     APIs
>
> by /rohit.yadav/
>
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>   edit 	api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 
> api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
>
>
>     CLOUDSTACK-7871: allow VM and template details update using update
>     APIs
>
> by /rohit.yadav/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>   edit 
> api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
>   edit 	api/src/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
>
>
>     CLOUDSTACK-7873 Fixed the user vm details length issue for higher
>     key lengths
>
> by /santhosh.edukulla/
>
>   edit 	setup/db/db/schema-441to450.sql
>   edit 	setup/db/create-schema.sql
>   edit 	engine/schema/src/com/cloud/vm/UserVmDetailVO.java
>
>
>     CLOUDSTACK-7828.Avoid marking IPs already in Allocated as
>     Allocated again. Use row lock to ensure that prev state is either
>     Allocating or Free. This will inturn avoid logging duplicate events
>
> by /santhosh.edukulla/
>
>   edit 	server/src/com/cloud/network/IpAddressManagerImpl.java
>
>
>     CLOUDSTACK-7873 Fixed the user vm details length issue for higher
>     key lengths
>
> by /santhosh.edukulla/
>
>   edit 	engine/schema/src/com/cloud/vm/UserVmDetailVO.java
>   edit 	setup/db/create-schema.sql
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     Fixed the wrong if else statement
>
> by /santhosh.edukulla/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java 
>
>
>
>     Adding support for backend snapshots to Xenserver625StorageProcessor
>
> by /mike.tutkowski/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java 
>
>   edit 
> engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java 
>
>
>
>     CID-1251369: not null check changed to null check
>
> by /daan/
>
>   edit 	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
>
>
>     CID-1250770 pass through mkdirs() return value
>
> by /daan/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/ManagedNfsStorageAdaptor.java 
>
>
>
>     CLOUDSTACK-7880: Creating shared network results in exception
>
> by /koushik/
>
>   edit 	server/src/com/cloud/network/NetworkServiceImpl.java
>   edit 
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java 
>
>
>
>     CLOUDSTACK-7880: Creating shared network results in exception
>
> by /koushik/
>
>   edit 
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java 
>
>   edit 	server/src/com/cloud/network/NetworkServiceImpl.java
>
>
>     CLOUDSTACK-7583: Send VmStats to Graphite host when configured
>
> by /wido/
>
>   add 	utils/src/org/apache/cloudstack/utils/graphite/GraphiteClient.java
>   add 
> utils/src/org/apache/cloudstack/utils/graphite/GraphiteException.java
>   edit 	setup/db/db/schema-450to460.sql
>   edit 	server/src/com/cloud/server/StatsCollector.java
>   edit 	server/src/com/cloud/configuration/Config.java
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     CLOUDSTACK-7865: fixed pep8 errors and errors in wrong references
>
> by /talluri/
>
>   edit 	test/integration/component/maint/test_bugs.py
>
>
>     CLOUDSTACK-7865: fixed pep8 errors and errors in wrong references
>
> by /talluri/
>
>   edit 	test/integration/component/maint/test_bugs.py
>
>
>     CLOUDSTACK-7706: Coverity defects
>
> by /santhosh.edukulla/
>
>   edit 	server/src/com/cloud/server/ManagementServerImpl.java
>   edit 
> api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java
>   edit 
> api/src/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java 
>
>   edit 
> api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java
>   edit 	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java 
>
>
>
>     CLOUDSTACK-7884: Cloudstack MS is not responding (happening
>     randomly) after some restart.
>
> by /min.chen/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     CLOUDSTACK-7884: Cloudstack MS is not responding (happening
>     randomly) after some restart.
>
> by /min.chen/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     CLOUDSTACK-7864: CPVM continues to be in Stopped state after a
>     failure to start because of a management server restart. Added
>     optimization to purge queue items for cancelled jobs.
>
> by /min.chen/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     CLOUDSTACK-7864: CPVM continues to be in Stopped state after a
>     failure to start because of a management server restart. Added
>     optimization to purge queue items for cancelled jobs.
>
> by /min.chen/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     CLOUDSTACK-7875: [UI] - VPC - Fix validation
>
> by /brian.federle/
>
>   edit 	ui/scripts/network.js
>
>
>     CLOUDSTACK-7645: [UI] Fixed incorrect label issues caused the
>     dictionary split
>
> by /brian.federle/
>
>   edit 	ui/scripts/sharedFunctions.js
>   edit 	ui/scripts/cloudStack.js
>
>
>     CLOUDSTACK-7831: Fixed unlocalized string on Advanced Network ->
>     Network tab
>
> by /brian.federle/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7318: [UI] Add error handler for VM snapshot creation
>
> by /brian.federle/
>
>   edit 	ui/scripts/instances.js
>
>
>     CLOUDSTACK-3528: [UI] Fix list calls on accounts page
>
> by /brian.federle/
>
>   edit 	ui/scripts/storage.js
>   edit 	ui/scripts/projects.js
>   edit 	ui/scripts/instances.js
>   edit 	ui/scripts/events.js
>   edit 	ui/scripts/network.js
>
>
>     Add properties file in same folder as template
>
> by /mike.tutkowski/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java 
>
>
>
>     CLOUDSTACK-7886: cloudstackoperations like deployvm,deleteNW are
>     failing if CS fail to contact rabbit mq server. This is happening
>     in case of Async API calls.
>
> by /koushik/
>
>   edit 	server/src/com/cloud/api/ApiServer.java
>
>
>     CLOUDSTACK-7886: cloudstackoperations like deployvm,deleteNW are
>     failing if CS fail to contact rabbit mq server. This is happening
>     in case of Async API calls.
>
> by /koushik/
>
>   edit 	server/src/com/cloud/api/ApiServer.java
>
>
>     CLOUDSTACK-3383: Fetch CPU utilization more reliable.
>
> by /wido/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
>
>
>
>     CLOUDSTACK-7583: Fix NPE caused by previous commit
>
> by /wido/
>
>   edit 	server/src/com/cloud/server/StatsCollector.java
>
>
>     CLOUDSTACK-7566:Many jobs getting stuck in pending state and cloud
>     is unusable.
>
> by /rohit.yadav/
>
>   edit 
> framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java 
>
>
>
>     CLOUDSTACK-7645: [UI] Fixed incorrect label issues caused the
>     dictionary split
>
> by /brian.federle/
>
>   edit 	ui/scripts/cloudStack.js
>   edit 	ui/scripts/sharedFunctions.js
>
>
>     CLOUDSTACK-7645
>
> by /brian.federle/
>
>   edit 	ui/scripts/configuration.js
>   edit 	ui/dictionary2.jsp
>
>
>     CLOUDSTACK-7645: UI: Fix method for extending dictionary
>
> by /brian.federle/
>
>   edit 	ui/scripts/cloudStack.js
>   edit 	ui/dictionary2.jsp
>
>
>     CLOUDSTACK-7590 Deletion of Account is not deleting the account
>     from the database
>
> by /prachi.damle/
>
>   edit 	engine/schema/src/com/cloud/user/dao/UserDaoImpl.java
>   edit 	setup/db/db/schema-441to450.sql
>   edit 	engine/schema/src/com/cloud/user/UserVO.java
>
>
>     CLOUDSTACK-7590 Deletion of Account is not deleting the account
>     from the database
>
> by /prachi.damle/
>
>   edit 	setup/db/db/schema-441to450.sql
>   edit 	engine/schema/src/com/cloud/user/dao/UserDaoImpl.java
>   edit 	engine/schema/src/com/cloud/user/UserVO.java
>
>
>     Added a "long getUsedIops(StoragePool)" method to the
>     PrimaryDataStoreDriver interface
>
> by /mike.tutkowski/
>
>   edit 
> plugins/storage/volume/sample/src/org/apache/cloudstack/storage/datastore/driver/SamplePrimaryDataStoreDriverImpl.java 
>
>   edit 
> plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java 
>
>   edit 
> plugins/storage/volume/nexenta/src/org/apache/cloudstack/storage/datastore/driver/NexentaPrimaryDataStoreDriver.java 
>
>   edit 	server/src/com/cloud/capacity/CapacityManagerImpl.java
>   edit 
> plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java 
>
>   edit 
> engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java 
>
>   edit 
> engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java 
>
>
>
>     CLOUDSTACK-7876 - Fixed the script 'test_vpc_vm_life_cycle.py' -
>     Destruction of VM before it can be recovered needs to be prevented
>
> by /sangeetha.hariharan/
>
>   edit 	test/integration/component/test_vpc_vm_life_cycle.py
>
>
>     CLOUDSTACK-7892: UI > network > detailView > execute handlers
>     attached to event
>     'cloudStack.module.sharedFunctions.addExtraProperties'.
>
> by /jessicawang/
>
>   edit 	ui/scripts/network.js
>
>
>     CLOUDSTACK-7892: UI > Infrastructure > zone > physical network >
>     guest > details tab > network tab > detail view > execute handlers
>     attached to event
>     'cloudStack.module.sharedFunctions.addExtraProperties'.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7891 - Fix failure in
>     integration.component.test_escalations_instances.TestInstances/test_15_revert_vm_to_snapshot
>
> by /sangeetha.hariharan/
>
>   edit 	test/integration/component/test_escalations_instances.py
>
>
>     CLOUDSTACK-7892: UI > Infrastructure > zones > zone > detailView >
>     execute handlers attached to event
>     'cloudStack.module.sharedFunctions.addExtraProperties'.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7892: UI > stroage > volume > detailView > execute
>     handlers attached to event
>     'cloudStack.module.sharedFunctions.addExtraProperties'.
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     CLOUDSTACK-7892: UI > instances > detailView > execute handlers
>     attached to event
>     'cloudStack.module.sharedFunctions.addExtraProperties'.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instances.js
>
>
>     CLOUDSTACK-7812: Fixed the script
>     'maint/test_redundant_router_network_rules.py' - Test Cases
>     failing on Simulator due to hardware resources requirement for
>     test execution
>
> by /sangeetha.hariharan/
>
>   edit 
> test/integration/component/maint/test_redundant_router_network_rules.py
>
>
>     CLOUDSTACK-7811: Fixed the script 'test_persistent_networks.py' -
>     Test Cases failing on Simulator due to hardware resources
>     requirement for test execution
>
> by /sangeetha.hariharan/
>
>   edit 	test/integration/component/test_persistent_networks.py
>
>
>     CLOUDSTACK-7786: Fixed the script 'test_haproxy.py' to be run only
>     on hardware
>
> by /sangeetha.hariharan/
>
>   edit 	test/integration/component/test_haproxy.py
>
>
>     CLOUDSTACK-7787: Fixed the script 'test_lb_secondary_ip.py' to be
>     run only on hardware
>
> by /sangeetha.hariharan/
>
>   edit 	test/integration/component/test_lb_secondary_ip.py
>
>
>     CLOUDSTACK-7788: Fixed the script
>     'test_dynamic_compute_offering.py' to be run only on hardware
>
> by /sangeetha.hariharan/
>
>   edit 	test/integration/component/test_dynamic_compute_offering.py
>
>
>     CLOUDSTACK-7887: change int to str into swiftxen
>
> by /pdion891/
>
>   edit 	scripts/vm/hypervisor/xenserver/swiftxen
>
>
>     CLOUDSTACK-7887: change int to str into swiftxen
>
> by /pdion891/
>
>   edit 	scripts/vm/hypervisor/xenserver/swiftxen
>
>
>     CLOUDSTACK-7896: UI > network > Add Guest Network > when zone
>     dropdown is empty, do not make API call to get physical networks.
>
> by /jessicawang/
>
>   edit 	ui/scripts/sharedFunctions.js
>
>
>     CLOUDSTACK-7896: UI > network > Add Guest Network > when zone
>     dropdown is empty, do not make API call to get physical networks.
>
> by /jessicawang/
>
>   edit 	ui/scripts/sharedFunctions.js
>
>
>     CLOUDSTACK-7898: Add properties file in same folder as template
>
> by /mike.tutkowski/
>
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java 
>
>
>
>     BUG-ID: CLOUDSTACK-7102. Volume migration fails with 'VM i-2-3-VM
>     does not exist in VMware datacenter' expection.
>
> by /likitha.shetty/
>
>   edit 	vmware-base/src/com/cloud/hypervisor/vmware/mo/DatacenterMO.java
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java 
>
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java 
>
>
>
>     CLOUDSTACK-7902: Account creation results in exception in logs
>
> by /koushik/
>
>   edit 	server/src/com/cloud/user/AccountManagerImpl.java
>
>
>     Update ListInternalLBVMsCmd.java
>
> by /rajanikaruturi/
>
>   edit 
> api/src/org/apache/cloudstack/api/command/admin/internallb/ListInternalLBVMsCmd.java 
>
>
>
>     CLOUDSTACK-7902: Account creation results in exception in logs
>
> by /koushik/
>
>   edit 	server/src/com/cloud/user/AccountManagerImpl.java
>
>
>     CLOUDSTACK-7582: Update Storage Pool API does not update tags
>     correctly
>
> by /rajesh.battala/
>
>   edit 
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java 
>
>   edit 	server/src/com/cloud/storage/StorageManagerImpl.java
>
>
>     Fixed few coverity issues like invalid boxing unboxing issues,
>     resource leaks, null dereferences
>
> by /santhosh.edukulla/
>
>   edit 
> api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java 
>
>   edit 	utils/src/com/cloud/utils/net/NetUtils.java
>   edit 	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
>   edit 	server/src/com/cloud/api/ApiServer.java
>   edit 
> plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java 
>
>   edit 
> engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java 
>
>   edit 
> api/src/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java 
>
>   edit 
> api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java
>   edit 
> plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java 
>
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>
>
>     CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases
>     build type
>
> by /rohit.yadav/
>
>   edit 	packaging/centos63/cloud.spec
>
>
>     CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases
>     build type
>
> by /rohit.yadav/
>
>   edit 	packaging/centos63/cloud.spec
>
>
>     CLOUDSTACK-7897 : Fixed the script test_reset_ssh_keypair.py -
>     Test Cases failing on Simulator as Testcases try to ssh to the VMs
>
> by /talluri/
>
>   edit 	test/integration/component/test_reset_ssh_keypair.py
>
>
>     CLOUDSTACK-7897 : Fixed the script test_reset_ssh_keypair.py -
>     Test Cases failing on Simulator as Testcases try to ssh to the VMs
>
> by /talluri/
>
>   edit 	test/integration/component/test_reset_ssh_keypair.py
>
>
>     CLOUDSTACK-7895 : Fixed the script test_security_groups.py - Test
>     Cases failing on Simulator as Testcases try to ssh to the VMs
>
> by /talluri/
>
>   edit 	test/integration/component/test_security_groups.py
>
>
>     CLOUDSTACK-7894 : Fixed the script test_vm_passwdenabled.py - Test
>     Cases failing on Simulator as Testcases try to ssh to the VMs
>
> by /talluri/
>
>   edit 	test/integration/component/test_vm_passwdenabled.py
>
>
>     CLOUDSTACK-7879: Skip dynamic scaling on vmware if vmware-tools
>     are not installed
>
> by /talluri/
>
>   edit 	test/integration/component/test_dynamic_compute_offering.py
>
>
>     CLOUDSTACK-7693: test_scale_vm.py - fix pep8 issues
>
> by /talluri/
>
>   edit 	test/integration/smoke/test_scale_vm.py
>
>
>     CLOUDSTACK-7904: EN-UK: CentOS 6.5 GUI: Key translation fails for
>     some  EN- UK keyboard keys.
>
> by /sanjay.tripathi/
>
>   edit 	systemvm/js/ajaxviewer.js
>   edit 	systemvm/js/ajaxkeys.js
>
>
>     CLOUDSTACK-7905: Add OEL 6.5 32/64 bit guest os support.
>
> by /sanjay.tripathi/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation
>
> by /wstevens/
>
>   edit 	server/test/resources/certs/rsa_ca_signed.key
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.crt
>   add 	server/test/resources/certs/rsa_self_signed.csr
>   add 	server/test/resources/certs/root_chain.csr
>   edit 	server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
>   delete 	server/test/resources/certs/rsa_ca_signed2.crt
>   edit 	server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
>   edit 	server/test/resources/certs/root_chain.crt
>   add 	server/test/resources/certs/rsa_ca_signed.csr
>   edit 	server/test/resources/certs/rsa_self_signed.key
>   delete 	server/test/resources/certs/dsa_self_signed.crt
>   edit 	server/test/resources/certs/rsa_self_signed_with_pwd.key
>   edit 	server/test/resources/certs/rsa_self_signed.crt
>   delete 	server/test/resources/certs/rsa_ca_signed2.key
>   add 	server/test/resources/certs/non_root.csr
>   add 	server/test/resources/certs/non_root.crt
>   edit 	server/test/resources/certs/root_chain.key
>   add 	server/test/resources/certs/rsa_self_signed_with_pwd.csr
>   edit 	server/test/resources/certs/rsa_ca_signed.crt
>   add 	server/test/resources/certs/non_root.key
>   delete 	server/test/resources/certs/rsa_random_pkey.key
>
>
>     CLOUDSTACK-7909: Change the capacity_state in op_host_Capacity
>     table only on explicit enabling/disabling of the host and remove
>     the logic for changing it when cluster/pod/zone is
>     enabled/disabled. Also add the logic in capacity checker thread so
>     that previous  changes finally get consistent with this new model
>     and also its good to have it for sanity reasons.
>
> by /nitin.mehta/
>
>   edit 	server/src/com/cloud/capacity/CapacityManagerImpl.java
>   edit 	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
>   edit 	server/src/com/cloud/resource/ResourceManagerImpl.java
>
>
>     CLOUDSTACK-7645: UI: Fix method for extending dictionary
>
> by /brian.federle/
>
>   edit 	ui/scripts/cloudStack.js
>   edit 	ui/dictionary2.jsp
>
>
>     CLOUDSTACK-7645: UI: Fix dictionary JSP include order
>
> by /brian.federle/
>
>   edit 	ui/index.jsp
>
>
>     CLOUDSTACK-7645: UI: Fix dictionary JSP include order
>
> by /brian.federle/
>
>   edit 	ui/index.jsp
>
>
>     CLOUDSTACK-7910: UI > Instance Wizard > declare
>     serviceOfferingObjs before using it.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instanceWizard.js
>
>
>     CLOUDSTACK-7910: UI > Instance Wizard > declare
>     serviceOfferingObjs before using it.
>
> by /jessicawang/
>
>   edit 	ui/scripts/instanceWizard.js
>
>
>     CLOUDSTACK-7877: The NET.IPRELEASE events are not added to
>     usage_event on IP range deletion from Physical Networks.
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
>
>
>     CLOUDSTACK-6924. To attach a volume if a volume needs to be moved
>     to another storage
>
> by /devdeep/
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>   edit 	engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java
>
>
>     While adding secondary storage / is not added to secondary storage
>     cifs url.
>
> by /devdeep/
>
>   edit 	ui/scripts/sharedFunctions.js
>
>
>     CLOUDSTACK-7642. Class not found exception after upgrading from
>     4.3 to 4.5 on a
>
> by /devdeep/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     CLOUDSTACK-7860: test_eip_elb.py - Move Netscler info out of the
>     test case. Read it from config. Fix attribute error. Fix pep8
>     issues. Fix imports.
>
> by /talluri/
>
>   edit 	test/integration/component/test_eip_elb.py
>
>
>     CLOUDSTACK-7885 : Fixed the script
>     '/maint/test_vpc_host_maintenance.py'
>
> by /talluri/
>
>   edit 	test/integration/component/maint/test_vpc_host_maintenance.py
>
>
>     CLOUDSTACK-7355 - test_netscaler_configs.py uses hardcoded
>     NetScaler credentials
>
> by /talluri/
>
>   edit 	tools/marvin/marvin/config/test_data.py
>   edit 	test/integration/component/test_netscaler_configs.py
>
>
>     Updated transaltions to JA & SC Files
>
> by /brian.federle/
>
>   edit 	client/WEB-INF/classes/resources/messages_zh_CN.properties
>   edit 	client/WEB-INF/classes/resources/messages.properties
>   edit 	client/WEB-INF/classes/resources/messages_ja_JP.properties
>
>
>     guest os name changes from 'SUSE Linux Enterprise Server 12
>     (experimental)' to 'SUSE Linux Enterprise Server 12 (64-bit)' in
>     XS 5.6 beta 3
>
> by /anthony.xu/
>
>   edit 	setup/db/db/schema-441to450.sql
>
>
>     Revert "CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to
>     wrongly declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC"
>
> by /Sheng Yang/
>
>   edit 	systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
>
>
>     CLOUDSTACK-7645: Use the localization function _l() instead of
>     dictionary directly
>
> by /brian.federle/
>
>   edit 	ui/scripts/configuration.js
>   edit 	ui/scripts/installWizard.js
>   edit 	ui/scripts/instances.js
>   edit 	ui/scripts/system.js
>   edit 	ui/scripts/zoneWizard.js
>   edit 	ui/scripts/ui-custom/zoneWizard.js
>
>
>     CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.
>
> by /nitin.mehta/
>
>   edit 	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
>   edit 	server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
>   edit 
> services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java 
>
>   edit 	server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
>
>
>     CLOUDSTACK-7916: Generate Alerts if System VMs cannot be started.
>
> by /nitin.mehta/
>
>   edit 	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
>   edit 
> services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java 
>
>
>
>     CLOUDSTACK-7773: UI > Infrastructure > SystemVMs, Routers > Change
>     Service Offering > service offerings dropdown > populate only
>     service offerings that the VM is allowed to change to. i.e.
>     exclude service offerings that the VM is not allowed to change to.
>
> by /jessicawang/
>
>   edit 	ui/scripts/system.js
>
>
>     CLOUDSTACK-7919: If there is an out of band movement for the VR,
>     irrespective of the fact that came as out of band live migrate or
>     HA, reboot the router to make sure the router has all the rules
>     configured.
>
> by /nitin.mehta/
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>     CLOUDSTACK-7920: NPE in the payload was causing the ssvm agent to
>     not connect, fix it and also make sure that template/volume sync
>     are robust that exceptions do not cause ssvm agent disconnect issues.
>
> by /nitin.mehta/
>
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java 
>
>   edit 	server/src/com/cloud/storage/download/DownloadListener.java
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>   edit 
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java 
>
>
>
>     Add 4.5.x messages.properties to Transifex config tool
>
> by /milamber/
>
>   edit 	tools/transifex/.tx/config
>
>
>     Update L10N resource files on master branch with 4.5 translation
>     strings
>
> by /milamber/
>
>   edit 	client/WEB-INF/classes/resources/messages_ko_KR.properties
>   edit 	client/WEB-INF/classes/resources/messages_nl_NL.properties
>   edit 	client/WEB-INF/classes/resources/messages_nb_NO.properties
>   edit 	client/WEB-INF/classes/resources/messages_ar.properties
>   edit 	client/WEB-INF/classes/resources/messages_es.properties
>   edit 	client/WEB-INF/classes/resources/messages_it_IT.properties
>   edit 	client/WEB-INF/classes/resources/messages_ja_JP.properties
>   edit 	client/WEB-INF/classes/resources/messages_ru_RU.properties
>   edit 	client/WEB-INF/classes/resources/messages_zh_CN.properties
>   edit 	client/WEB-INF/classes/resources/messages_de_DE.properties
>   edit 	client/WEB-INF/classes/resources/messages_pt_BR.properties
>   edit 	client/WEB-INF/classes/resources/messages_ca.properties
>   edit 	client/WEB-INF/classes/resources/messages_fr_FR.properties
>   edit 	client/WEB-INF/classes/resources/messages_pl.properties
>
>
>     volume upload: PSK exchange between managemnet server and SSVM
>
> by /rajanikaruturi/
>
>   edit 	server/src/com/cloud/server/ConfigurationServerImpl.java
>   edit 	server/src/com/cloud/configuration/Config.java
>
>
>     volume upload: sending the preshared key to ssvm
>
> by /rajanikaruturi/
>
>   edit 
> services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java 
>
>   edit 	core/src/com/cloud/agent/api/SecStorageSetupCommand.java
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     changed commons-io version to the latest stable 2.4
>
> by /rajanikaruturi/
>
>   edit 	utils/pom.xml
>   edit 	plugins/hypervisors/kvm/pom.xml
>   edit 	server/pom.xml
>   edit 	services/iam/server/pom.xml
>   edit 	framework/db/pom.xml
>   edit 	framework/jobs/pom.xml
>   edit 	agent/pom.xml
>   edit 	pom.xml
>   edit 	framework/spring/module/pom.xml
>
>
>     volume upload: added getUploadParamsForVolume and
>     getUploadParamsForTemplate api
>
> by /rajanikaruturi/
>
>   add 
> api/src/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolume.java 
>
>   add 
> api/src/org/apache/cloudstack/api/response/GetUploadParamsResponse.java
>   add 
> api/src/org/apache/cloudstack/api/AbstractGetUploadParamsCommand.java
>   edit 	server/src/com/cloud/server/ManagementServerImpl.java
>   edit 	client/tomcatconf/commands.properties.in
>   add 
> api/src/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplate.java 
>
>   edit 	api/src/org/apache/cloudstack/api/ApiConstants.java
>
>
>     volume upload: persisting the template metadata
>
> by /rajanikaruturi/
>
>   edit 	server/src/com/cloud/template/HypervisorTemplateAdapter.java
>   edit 
> api/src/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplate.java 
>
>   edit 	server/src/com/cloud/template/TemplateAdapterBase.java
>   edit 
> api/src/org/apache/cloudstack/api/response/GetUploadParamsResponse.java
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>   add 
> core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java 
>
>   edit 	core/pom.xml
>   edit 	server/src/com/cloud/template/TemplateAdapter.java
>   edit 
> plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java 
>
>   edit 	api/src/com/cloud/template/TemplateApiService.java
>
>
>     volume upload: renamed command classes to follow the naming convention
>
> by /rajanikaruturi/
>
>   delete 
> api/src/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplate.java 
>
>   edit 	server/src/com/cloud/template/TemplateAdapter.java
>   add 
> api/src/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolumeCmd.java 
>
>   add 
> api/src/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java 
>
>   edit 	api/src/com/cloud/template/TemplateApiService.java
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>   edit 	server/src/com/cloud/template/TemplateAdapterBase.java
>   edit 	server/src/com/cloud/server/ManagementServerImpl.java
>   add 	api/src/org/apache/cloudstack/api/AbstractGetUploadParamsCmd.java
>   edit 	server/src/com/cloud/template/HypervisorTemplateAdapter.java
>   delete 
> api/src/org/apache/cloudstack/api/AbstractGetUploadParamsCommand.java
>   delete 
> api/src/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolume.java 
>
>
>
>     ccp-4.3: Fixed NPE in deleting acl item in default ACL
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
>
>
>     volume upload: added the url validation check when url is not null
>
> by /rajanikaruturi/
>
>   edit 	server/src/com/cloud/template/TemplateAdapterBase.java
>
>
>     volume upload: persisting the volume metadata
>
> by /rajanikaruturi/
>
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>   edit 	utils/pom.xml
>   edit 
> core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java 
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>   edit 
> engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java 
>
>   add 	utils/src/com/cloud/utils/EncryptionUtil.java
>   edit 
> api/src/org/apache/cloudstack/api/command/user/volume/GetUploadParamsForVolumeCmd.java 
>
>   edit 	api/src/com/cloud/storage/VolumeApiService.java
>
>
>     volume upload: removed unused variables
>
> by /rajanikaruturi/
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>
>
>     External dhcp changes deploy vm without VR.
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/api/ApiResponseHelper.java
>   edit 	server/test/com/cloud/vpc/MockNetworkModelImpl.java
>   edit 	server/test/com/cloud/network/MockNetworkModelImpl.java
>   edit 	server/src/com/cloud/network/element/VirtualRouterElement.java
>   edit 	server/src/com/cloud/network/IpAddressManagerImpl.java
>   edit 	engine/components-api/src/com/cloud/network/IpAddressManager.java
>   edit 	server/src/com/cloud/network/NetworkModelImpl.java
>   edit 	api/src/com/cloud/network/NetworkModel.java
>   edit 	api/src/com/cloud/network/IpAddress.java
>   edit 	server/src/com/cloud/network/guru/DirectNetworkGuru.java
>
>
>     config drive changes
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>   edit 	core/src/com/cloud/agent/api/StartCommand.java
>   edit 	core/src/com/cloud/agent/api/routing/VmDataCommand.java
>
>
>     volume upload: starting NIO server on SSVM
>
> by /rajanikaruturi/
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     volume upload: fixed null in api response
>
> by /rajanikaruturi/
>
>   edit 
> api/src/org/apache/cloudstack/api/response/GetUploadParamsResponse.java
>
>
>     BUG-ID:CS-26530 Adding config drive only for SG network without
>     services
>
> by /jayapal/
>
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>
>
>     BUG-ID:CS-26530 deleting configdrive iso on VM stop
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>
>
>     BUG-ID:CS-26530 included password in configdrive
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>   edit 
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
>
>
>     volume-upload added a upload url redirect in apache conf
>
> by /rajanikaruturi/
>
>   edit 	systemvm/patches/debian/config/etc/init.d/cloud-early-config
>   edit 
> systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl
>
>
>     volume upload: fixed circular reference error while generating json
>
> by /rajanikaruturi/
>
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>   add 
> core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommandTypeAdapter.java 
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>
>
>     volume upload: doing https redirect as NioServer handles only https
>
> by /rajanikaruturi/
>
>   edit 
> systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl
>
>
>     volume upload: persisting the PSK only when its not present
>
> by /rajanikaruturi/
>
>   edit 	server/src/com/cloud/server/ConfigurationServerImpl.java
>
>
>     BUG-ID:CS-26530 adding vm details into op_vm_ipfetch table
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   add 	engine/schema/src/com/cloud/network/dao/VmIpFetchDao.java
>   add 	setup/db/db/schema-450to451.sql
>   add 	engine/schema/src/com/cloud/network/dao/VmIpFetchVO.java
>   add 	engine/schema/src/com/cloud/network/dao/VmIpFetchDaoImpl.java
>   edit 
> engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml 
>
>
>
>     volume upload: management server polling and upload status from agent
>
> by /koushik/
>
>   add 	server/src/com/cloud/storage/ImageStoreUploadMonitor.java
>   add 	server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
>   add 
> core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java
>   add 
> core/src/org/apache/cloudstack/storage/command/UploadStatusAnswer.java
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>   edit 
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreDao.java 
>
>   edit 	api/src/com/cloud/storage/Volume.java
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java 
>
>   edit 
> plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java 
>
>   edit 
> server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml 
>
>   edit 
> plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManager.java 
>
>   edit 
> plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java 
>
>
>
>     BUG-ID:CS-26530: KVM support for config drive
>
> by /kishan/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
>
>
>
>     BUG-ID:CS-26530: Added ip retrieval logic
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 	engine/schema/src/com/cloud/network/dao/VmIpFetchVO.java
>   edit 
> plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java 
>
>
>
>     Add front-end file uploader
>
> by /brian.federle/
>
>   edit 	ui/scripts/templates.js
>   edit 	ui/scripts/ui/dialog.js
>
>
>     volume upload: removed the transition from IN-PROGRESS to ABONDONED
>
> by /rajanikaruturi/
>
>   edit 	server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
>
>
>     volume upload: management server polling and upload status from agent
>
> by /koushik/
>
>   edit 
> core/src/org/apache/cloudstack/storage/command/UploadStatusCommand.java
>   edit 	server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
>   edit 	api/src/com/cloud/storage/Volume.java
>
>
>     volume upload: added httpcomponents server and removed nio server
>
> by /rajanikaruturi/
>
>   edit 	services/secondary-storage/server/pom.xml
>   edit 	server/pom.xml
>   edit 	test/pom.xml
>   edit 
> systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>   edit 	pom.xml
>
>
>     volume upload: removed the handlerFactory and the handler which
>     were required by NioServer
>
> by /rajanikaruturi/
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     volume upload: management server polling and upload status from agent
>
> by /koushik/
>
>   edit 
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java 
>
>   edit 	engine/schema/src/com/cloud/storage/dao/VMTemplateDao.java
>   edit 	engine/schema/src/com/cloud/storage/VMTemplateVO.java
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java 
>
>   edit 
> engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java 
>
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java 
>
>   edit 
> engine/storage/src/org/apache/cloudstack/storage/image/TemplateEntityImpl.java 
>
>   edit 	server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
>   edit 	engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
>   edit 	api/src/com/cloud/template/VirtualMachineTemplate.java
>
>
>     BUG-ID:CS-26530: KVM support for get Vm Ip
>
> by /kishan/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
>
>   add 	core/src/com/cloud/agent/api/GetVmIpAddressCommand.java
>
>
>     Close dialog after upload
>
> by /brian.federle/
>
>   edit 	ui/scripts/ui/dialog.js
>
>
>     Added changes to maintain and send the upload progress.
>
> by /rajanikaruturi/
>
>   add 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/template/uploadEntity.java 
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     volume upload: added post request parser to get the file content
>
> by /rajanikaruturi/
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     volume upload: removed debug messages in post request handler.
>
> by /rajanikaruturi/
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     volume-upload: initializing state for volume and also setting the
>     post url in volume_store_ref
>
> by /koushik/
>
>   add 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadEntity.java 
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>   delete 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/template/uploadEntity.java 
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     volume upload: parsing post body to get all the params
>
> by /rajanikaruturi/
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     volume-upload: gc thread to clean partially uploaded files
>
> by /koushik/
>
>   edit 	api/src/com/cloud/storage/Volume.java
>
>
>     Volume upload: sending the nfsstore url in the metadata
>
> by /rajanikaruturi/
>
>   edit 
> core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java 
>
>   edit 
> engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java 
>
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>
>
>     BUG-ID:CS-26530: Removing vmIpFetch table and added map
>
> by /jayapal/
>
>   edit 	engine/schema/src/com/cloud/network/dao/NetworkDaoImpl.java
>   delete 	setup/db/db/schema-450to451.sql
>   edit 	server/test/com/cloud/vpc/dao/MockNetworkDaoImpl.java
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>   edit 
> engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml 
>
>   delete 	engine/schema/src/com/cloud/network/dao/VmIpFetchDao.java
>   edit 	engine/schema/src/com/cloud/network/dao/NetworkDao.java
>   delete 	engine/schema/src/com/cloud/network/dao/VmIpFetchVO.java
>   delete 	engine/schema/src/com/cloud/network/dao/VmIpFetchDaoImpl.java
>
>
>     Add to storage->upload volume dialog
>
> by /brian.federle/
>
>   edit 	ui/scripts/storage.js
>
>
>     Allow passing custom data in POST request
>
> by /brian.federle/
>
>   edit 	ui/scripts/ui/dialog.js
>   edit 	ui/scripts/templates.js
>
>
>     Revert "Allow passing custom data in POST request"
>
> by /jessicawang/
>
>   edit 	ui/scripts/ui/dialog.js
>   edit 	ui/scripts/templates.js
>
>
>     Revert "Add to storage->upload volume dialog"
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     (1) Remove UploadFile button from Register Template dialog. (2)
>     sync latest templates.js from master branch.
>
> by /jessicawang/
>
>   edit 	ui/scripts/templates.js
>
>
>     volume-upload: UI > templates > add new action "Upload Template
>     from Local".
>
> by /jessicawang/
>
>   edit 	ui/scripts/templates.js
>
>
>     volume upload: refactored post upload command and used it during
>     template registration
>
> by /rajanikaruturi/
>
>   delete 
> core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommandTypeAdapter.java 
>
>   edit 	server/src/com/cloud/template/HypervisorTemplateAdapter.java
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>   edit 
> core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java 
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>   edit 	server/src/com/cloud/template/TemplateManagerImpl.java
>
>
>     volume upload: fixed nio server blocking thread issue
>
> by /rajanikaruturi/
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     volume upload: fixed build error from the commit
>     b0a96c4c85f2d6dfe57ce3474ce95ebb3cec6d2a
>
> by /rajanikaruturi/
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     BUG-ID:CS-26530: For windoes guest vm fetchIp from registry
>
> by /kishan/
>
>   edit 
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java 
>
>
>
>     BUG-ID:CS-26530 Added thread for getting vm ip address
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>
>
>     made changes to move a file to the specified localtion
>
> by /rajanikaruturi/
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManager.java 
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java 
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/template/UploadEntity.java 
>
>
>
>     BUG-ID:CS-26530 Added global configs for threads
>
> by /jayapal/
>
>   edit 	server/src/com/cloud/vm/UserVmManagerImpl.java
>
>
>     BUG-ID: CS-20483 volume upload: fixed an issue due to volume
>     upload branch merge
>
> by /rajanikaruturi/
>
>   edit 	server/src/com/cloud/configuration/Config.java
>
>
>     BUG-ID: CS-26107: management server polling and upload status from
>     agent
>
> by /koushik/
>
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>   edit 	server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
>   edit 
> plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockStorageManagerImpl.java 
>
>
>
>     Bug-Id: CS-34718: Correcting the test script for skipping tests -
>     test_base_image_updation.py, test_assign_vm.py
>
> by /Sanjeev.Neelarapu/
>
>   edit 	test/integration/component/test_assign_vm.py
>   edit 	test/integration/component/test_base_image_updation.py
>
>
>     volume upload: BUG-ID:CS-20483 disabled url check during upload volume
>
> by /rajanikaruturi/
>
>   edit 	server/src/com/cloud/storage/VolumeApiServiceImpl.java
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>
>
>     BUG-ID:CS-34491: Fix shared network ip allocation
>
> by /kishan/
>
>   edit 	server/src/com/cloud/network/IpAddressManagerImpl.java
>
>
>     BUG-ID:BUG-ID:CS-20483 Changed the state map to maintain the
>     upload states based on entity ids.
>
> by /bharat.kumar/
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     BUG-ID: CS-34824: volume-upload: UI > templates > upload template
>     from local > pass ispublic, requireshvm, isfeatured, isrouting
>     parameter to getUploadParamsForTemplate API if corresponding
>     fields are not hidden.
>
> by /jessicawang/
>
>   edit 	ui/scripts/templates.js
>
>
>     BUG-ID: CS-34824: volume-upload: tempalates > upload template from
>     local > format dropdown > show different options upon selected
>     hypervisor.
>
> by /jessicawang/
>
>   edit 	ui/scripts/templates.js
>
>
>     BUG-ID: CS-34824: volume-upload: UI > upload template from local >
>     fix a bug that fields below OS Type field (isPublic, isFeatured, ~
>     ) are not created.
>
> by /jessicawang/
>
>   edit 	ui/scripts/templates.js
>
>
>     createForm uploader: Pass $form; Allow sending custom params
>     through POST
>
> by /brian.federle/
>
>   edit 	ui/scripts/ui/dialog.js
>
>
>     BUG-ID: CS-34824: volume-upload: tempalates > upload template from
>     local > format dropdown > include OVA, VMDK, BareMetal, TAR, VHDX
>     option.
>
> by /jessicawang/
>
>   edit 	ui/scripts/templates.js
>
>
>     BUG-ID: CS-34824: volume-upload: UI > upload template from local >
>     after uploading file to postURL, pop up a message indicating where
>     to check the template's newest status.
>
> by /jessicawang/
>
>   edit 	ui/scripts/templates.js
>
>
>     BUG-ID: CS-34824: volume-upload: UI > dialog widget > write log in
>     console indicating callback() is triggered.
>
> by /jessicawang/
>
>   edit 	ui/scripts/ui/dialog.js
>
>
>     BUG-ID: CS-34824: volume-upload: UI > storage > volumes > add new
>     action "Upload Volume from Local" in header of listView.
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     BUG-ID: CS-26107: management server polling and upload status from
>     agent
>
> by /koushik/
>
>   edit 
> core/src/org/apache/cloudstack/storage/command/UploadStatusAnswer.java
>   edit 	server/src/com/cloud/storage/ImageStoreUploadMonitorImpl.java
>
>
>     volume upload: BUG-ID:CS-20483 persisting into volume store ref
>     only when SSVM is found
>
> by /rajanikaruturi/
>
>   edit 
> engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java 
>
>
>
>     volume upload: BUG-ID:CS-20483 updating the PSK if its null
>
> by /rajanikaruturi/
>
>   edit 	server/src/com/cloud/server/ConfigurationServerImpl.java
>
>
>     BUG-ID : CS-35208
>
> by /anthony.xu/
>
>   edit 	scripts/vm/hypervisor/xenserver/vmops
>
>
>     Reduce size of 'select view' dropdown to fix more dense toolbars.
>
> by /brian.federle/
>
>   edit 	ui/css/cloudstack3.css
>
>
>     BUG-ID: CS-34824: volume-upload: templates > (1) Shorten action
>     label to make all items in header to fit into one line, otherwise
>     search box will be pushed out of place. (2) Register Template
>     dialog: move URL field to the top.
>
> by /jessicawang/
>
>   edit 	ui/scripts/templates.js
>
>
>     BUG-ID: CS-34824: volume-upload: volumes > (1) Shorten action
>     label to make all items in header to fit into one line, otherwise
>     search box will be pushed out of place. (2) Add dialog: move URL
>     field to the top.
>
> by /jessicawang/
>
>   edit 	ui/scripts/storage.js
>
>
>     BUG-ID: CS-32841: CLONE - listVolumes API fails for a particular
>     domain
>
> by /min.chen/
>
>   edit 	server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
>
>
>     BUG-ID: CS-34824: volume-upload: UI > dialog widget > display
>     $frameForm(the hidden form to submit file with
>     signature/expires/metadata) in console log.
>
> by /jessicawang/
>
>   edit 	ui/scripts/ui/dialog.js
>
>
>     BUG-ID: CS-35214
>
> by /anthony.xu/
>
>   edit 	ui/scripts/zoneWizard.js
>
>
>     volume upload: BUG-ID:CS-20483 modified parsing logic
>
> by /rajanikaruturi/
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     volume upload: BUG-ID:CS-20483 fixed the post body parsing logic
>
> by /rajanikaruturi/
>
>   edit 
> services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java 
>
>
>
>     BUG-ID: CS-34556: CLONE - Global parameter
>     system.vm.default.hypervisor not taking effect.
>
> by /sanjay.tripathi/
>
>   edit 
> server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
>
>
>
>   Console Output
>
> <http://jenkins-ccp.citrix.com/job/CloudPlatform_4.x_Plus_Builds_Job2/331//console> 
>
> [...truncated 8448 lines...]
> rhel6: 6350K .......... .......... .......... .......... .......... 
> 88% 41.8M 0s
> rhel6: 6400K .......... .......... .......... .......... .......... 
> 89% 8.58M 0s
> rhel6: 6450K .......... .......... .......... .......... .......... 
> 89% 88.4M 0s
> rhel6: 6500K .......... .......... .......... .......... .......... 
> 90% 136M 0s
> rhel6: 6550K .......... .......... .......... .......... .......... 
> 91% 116M 0s
> rhel6: 6600K .......... .......... .......... .......... .......... 
> 91% 126M 0s
> rhel6: 6650K .......... .......... .......... .......... .......... 
> 92% 126M 0s
> rhel6: 6700K .......... .......... .......... .......... .......... 
> 93% 121M 0s
> rhel6: 6750K .......... .......... .......... .......... .......... 
> 94% 129M 0s
> rhel6: 6800K .......... .......... .......... .......... .......... 
> 94% 95.0M 0s
> rhel6: 6850K .......... .......... .......... .......... .......... 
> 95% 12.2M 0s
> rhel6: 6900K .......... .......... .......... .......... .......... 
> 96% 31.9M 0s
> rhel6: 6950K .......... .......... .......... .......... .......... 
> 96% 182M 0s
> rhel6: 7000K .......... .......... .......... .......... .......... 
> 97% 178M 0s
> rhel6: 7050K .......... .......... .......... .......... .......... 
> 98% 183M 0s
> rhel6: 7100K .......... .......... .......... .......... .......... 
> 98% 183M 0s
> rhel6: 7150K .......... .......... .......... .......... .......... 
> 99% 172M 0s
> rhel6: 7200K .......... .......... .......... ... 100% 109M=0.1s
> rhel6:
> rhel6: 2015-01-23 03:17:48 (51.4 MB/s) - 
> “/tmp/tmp.FtS9RlZPx2/CloudPlatform-Interop-4.5.0.1-0.331-rhel6/CloudPlatform-4.5.0.1-331-hypervagent.msi” 
> saved [7407101/7407101]
> rhel6:
> rhel6: + 
> mibLocation=source//plugins/alert-handlers/snmp-alerts/CS-ROOT-MIB.mib
> rhel6: + '[' -f 
> source//plugins/alert-handlers/snmp-alerts/CS-ROOT-MIB.mib ']'
> rhel6: + cp source//plugins/alert-handlers/snmp-alerts/CS-ROOT-MIB.mib 
> /tmp/tmp.FtS9RlZPx2/CloudPlatform-Interop-4.5.0.1-0.331-rhel6/
> rhel6: /tmp/tmp.FtS9RlZPx2 ~/cloudplatform/build
> rhel6: + '[' xFalse == xTrue ']'
> rhel6: + pushd /tmp/tmp.FtS9RlZPx2
> rhel6: + tar czf CloudPlatform-Interop-4.5.0.1-0.331-rhel6.tar.gz 
> CloudPlatform-Interop-4.5.0.1-0.331-rhel6
> rhel6: ~/cloudplatform/build
> rhel6: + popd
> rhel6: + mv 
> /tmp/tmp.FtS9RlZPx2/CloudPlatform-Interop-4.5.0.1-0.331-rhel6.tar.gz .
> rhel6: + rm -rf /tmp/tmp.FtS9RlZPx2
> rhel6: + tgtfldr=repo-ccp.citrix.com:/var/www/html/releases
> rhel6: + '[' xnone '!=' xnone ']'
> rhel6: + ssh root@repo-ccp.citrix.com mkdir -p 
> /var/www/html/releases/rhel/6.3/
> rhel6: + scp CloudPlatform-Interop-4.5.0.1-0.331-rhel6.tar.gz 
> repo-ccp.citrix.com:/var/www/html/releases/4.5.0.1/rhel/6.3/
> rhel6: + rm -fr CloudPlatform-Interop-4.5.0.1-0.331-rhel6.tar.gz
> rhel6: Tarball 
> URL:http://repo-ccp.citrix.com/releases/4.5.0.1/rhel/6.3/CloudPlatform-Interop-4.5.0.1-0.331-rhel6.tar.gz 
>
> rhel6: + echo 'Tarball 
> URL:http://repo-ccp.citrix.com/releases/4.5.0.1/rhel/6.3/CloudPlatform-Interop-4.5.0.1-0.331-rhel6.tar.gz' 
>
> rhel6: /root
> supervisor: all processes terminated normally
> Cannot find mail address for pradeep
> real 15m17.555s
> user 0m0.785s
> sys 0m2.258s
> + cd -
> /root/.jenkins/jobs/CloudPlatform_4.x_Plus_Builds_Job2/workspace
> Email was triggered for: Success
> Sending email for trigger: Success
>
>


Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message