[2/3] git commit: updated refs/heads/4.4 to e8f7215

[dahn]

api: avoid sending sensitive data in api response

- UI: use post when updating user
- S3: don't send s3 key in the response
- VPN: don't send preshared key in remoteaccessvpn api response
- Snapshot response should set zone id not volume's device id

Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>

Conflicts:
        server/src/com/cloud/api/ApiResponseHelper.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d3122a1b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d3122a1b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d3122a1b

Branch: refs/heads/4.4
Commit: d3122a1b8cf27a6f84c5a2cdba11f8926029cf5b
Parents: 0b68bf2
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
Authored: Wed Mar 11 16:30:20 2015 +0530
Committer: Daan Hoogland <d...@onecht.net>
Committed: Tue Mar 17 13:16:22 2015 +0100

----------------------------------------------------------------------
 server/src/com/cloud/api/ApiResponseHelper.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d3122a1b/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java 
b/server/src/com/cloud/api/ApiResponseHelper.java
index 3d174c7..5c6df1b 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -452,6 +452,10 @@ public class ApiResponseHelper implements 
ResponseGenerator {
             snapshotResponse.setVolumeId(volume.getUuid());
             snapshotResponse.setVolumeName(volume.getName());
             snapshotResponse.setVolumeType(volume.getVolumeType().name());
+            DataCenter zone = 
ApiDBUtils.findZoneById(volume.getDataCenterId());
+            if (zone != null) {
+                snapshotResponse.setZoneId(zone.getUuid());
+            }
         }
         snapshotResponse.setCreated(snapshot.getCreated());
         snapshotResponse.setName(snapshot.getName());