Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2D419200BD8 for ; Wed, 7 Dec 2016 19:58:36 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2BC9B160B26; Wed, 7 Dec 2016 18:58:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9C0E2160B0C for ; Wed, 7 Dec 2016 19:58:35 +0100 (CET) Received: (qmail 83609 invoked by uid 500); 7 Dec 2016 18:58:34 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 83467 invoked by uid 99); 7 Dec 2016 18:58:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2016 18:58:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 99C62E7DFC; Wed, 7 Dec 2016 18:58:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Wed, 07 Dec 2016 18:58:35 -0000 Message-Id: In-Reply-To: <8a01a4329dc54a4abd3e3646c3080b18@git.apache.org> References: <8a01a4329dc54a4abd3e3646c3080b18@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to 0eb1069 archived-at: Wed, 07 Dec 2016 18:58:36 -0000 Merge pull request #1618 from greenqloud/pr-return-os-info-snapshots [CLOUDSTACK-9643] Now returning os info with the list snapshot responseThis commit adds the ID and display name of the OS on the volume. * pr/1618: CLOUDSTACK-9643: Now returning os info with the list snapshot response Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0eb1069b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0eb1069b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0eb1069b Branch: refs/heads/master Commit: 0eb1069bbf4b313fc04d08e96ee42ceb38909e43 Parents: 136a0ca 7ef87b6 Author: Rohit Yadav Authored: Thu Dec 8 00:26:37 2016 +0530 Committer: Rohit Yadav Committed: Thu Dec 8 00:26:37 2016 +0530 ---------------------------------------------------------------------- .../command/user/snapshot/ListSnapshotsCmd.java | 4 +- .../api/response/SnapshotResponse.java | 26 +- server/src/com/cloud/api/ApiResponseHelper.java | 296 ++++++++++--------- 3 files changed, 176 insertions(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0eb1069b/server/src/com/cloud/api/ApiResponseHelper.java ----------------------------------------------------------------------