[airavata] branch jupyter-integration updated (c7f3083 -> 0cf2103)

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a change to branch jupyter-integration
in repository https://gitbox.apache.org/repos/asf/airavata.git.


    from c7f3083  Merge branch 'develop' into jupyter-integration
     add ec66759  Adding missing thrift workflow data models
     new 0cf2103  Merge branch 'develop' into jupyter-integration

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/airavata/model/workflow/{core => }/ComponentType.java    | 2 +-
 .../java/org/apache/airavata/model/workflow/{core => }/DataBlock.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 copy airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/{core => }/ComponentType.java (97%)
 copy airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workflow/{core => }/DataBlock.java (99%)

[airavata] 01/01: Merge branch 'develop' into jupyter-integration

[di...@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 <di...@gmail.com>
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(+)