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 c7f3083bea783470004fbc90e56ccd629fae3a35 Merge: 87b85ee b377c7d Author: dimuthu <[email protected]> AuthorDate: Wed Aug 29 01:30:53 2018 -0400 Merge branch 'develop' into jupyter-integration .../resources/lib/airavata/api/Airavata-remote | 16 +- .../main/resources/lib/airavata/api/Airavata.py | 160 +-- .../resources/lib/airavata/model/sharing/ttypes.py | 24 +- .../lib/airavata/model/workflow/ttypes.py | 1378 ++++++++++++++++---- .../airavata/model/workflow/AiravataWorkflow.java | 282 ++-- .../model/workflow/WorkflowConnection.java | 56 +- .../airavata/model/workflow/WorkflowHandler.java | 483 +++---- .../expcatalog/ExperimentSummaryRepository.java | 8 +- .../ExperimentSummaryRepositoryTest.java | 4 +- .../workflowcatalog/WorkflowRepositoryTest.java | 1 - .../airavata_workflow_model.thrift | 113 +- .../core-models/component_type.thrift | 29 - .../core-models/data_block_model.thrift | 34 - .../workflow_application_model.thrift | 61 - .../workflow_connection_model.thrift | 41 - .../workflow_handler_model.thrift | 70 - 16 files changed, 1637 insertions(+), 1123 deletions(-)
