From commits-return-19620-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Wed Aug 29 15:54:55 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id DEFCD180675 for ; Wed, 29 Aug 2018 15:54:54 +0200 (CEST) Received: (qmail 15096 invoked by uid 500); 29 Aug 2018 13:54:54 -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 15070 invoked by uid 99); 29 Aug 2018 13:54:54 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Aug 2018 13:54:54 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 80F128510C; Wed, 29 Aug 2018 13:54:53 +0000 (UTC) Date: Wed, 29 Aug 2018 13:54:53 +0000 To: "commits@airavata.apache.org" Subject: [airavata] 01/01: Merge branch 'develop' into jupyter-integration MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: dimuthuupe@apache.org In-Reply-To: <153555089285.11749.17088892229327725904@gitbox.apache.org> References: <153555089285.11749.17088892229327725904@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: airavata X-Git-Refname: refs/heads/jupyter-integration X-Git-Reftype: branch X-Git-Rev: 0cf2103483966a18b3a85ab2d876d715f7c6ef3f X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180829135453.80F128510C@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. dimuthuupe pushed a commit to branch jupyter-integration in repository https://gitbox.apache.org/repos/asf/airavata.git commit 0cf2103483966a18b3a85ab2d876d715f7c6ef3f Merge: c7f3083 ec66759 Author: dimuthu AuthorDate: Wed Aug 29 09:54:31 2018 -0400 Merge branch 'develop' into jupyter-integration .../airavata/model/workflow/ComponentType.java | 62 ++ .../apache/airavata/model/workflow/DataBlock.java | 806 +++++++++++++++++++++ 2 files changed, 868 insertions(+)