Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5535D172E9 for ; Thu, 6 Nov 2014 22:00:30 +0000 (UTC) Received: (qmail 37903 invoked by uid 500); 6 Nov 2014 22:00:30 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 37858 invoked by uid 500); 6 Nov 2014 22:00:30 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 37849 invoked by uid 99); 6 Nov 2014 22:00:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Nov 2014 22:00:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BC8049284C8; Thu, 6 Nov 2014 22:00:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Thu, 06 Nov 2014 22:00:30 -0000 Message-Id: <45227984e2e24db48aa28f36a8e86415@git.apache.org> In-Reply-To: <269cdfcf87c74c07922d46d5e88bc216@git.apache.org> References: <269cdfcf87c74c07922d46d5e88bc216@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] airavata git commit: Merge remote-tracking branch 'origin/gfac_appcatalog_int' into gfac_appcatalog_int Merge remote-tracking branch 'origin/gfac_appcatalog_int' into gfac_appcatalog_int Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/088e80f0 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/088e80f0 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/088e80f0 Branch: refs/heads/gfac_appcatalog_int Commit: 088e80f035372fd25f4f07ea6f06b2ec230cce28 Parents: 428b240 f9fdf53 Author: shamrath Authored: Thu Nov 6 17:00:06 2014 -0500 Committer: shamrath Committed: Thu Nov 6 17:00:06 2014 -0500 ---------------------------------------------------------------------- .../model/util/ExperimentModelUtil.java | 15 +-- .../registry/jpa/impl/ExperimentRegistry.java | 126 ++++++++++--------- .../registry/jpa/impl/RegistryImpl.java | 13 +- .../jpa/utils/ThriftDataModelConversion.java | 101 ++++++++------- 4 files changed, 135 insertions(+), 120 deletions(-) ----------------------------------------------------------------------