Merge release branch 4.9 to master

koushik-das · koushik-das · commit 027409d9bcf0 · 2016-11-21T11:25:38.000+05:30
* 4.9:
  CLOUDSTACK-9410: Data Disk shown as detached in XS
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
@@ -461,9 +461,6 @@ public Answer dettachVolume(final DettachCommand cmd) {
                     vbd.destroy(conn);
                 }
 
-                // Update the VDI's label to be "detached"
-                vdi.setNameLabel(conn, "detached");
-
                 hypervisorResource.umount(conn, vdi);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -461,9 +461,6 @@ public Answer dettachVolume(final DettachCommand cmd) {`
`461`	`461`	`vbd.destroy(conn);`
`462`	`462`	`}`
`463`	`463`
`464`		`- // Update the VDI's label to be "detached"`
`465`		`- vdi.setNameLabel(conn, "detached");`
`466`		`-`
`467`	`464`	`hypervisorResource.umount(conn, vdi);`
`468`	`465`	`}`
`469`	`466`