Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into grouper-integration
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/69631afc Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/69631afc Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/69631afc Branch: refs/heads/develop Commit: 69631afc8e30a07aef3a900ec474c8c77c19e354 Parents: d001846 ddda60c Author: scnakandala <[email protected]> Authored: Wed Jul 13 13:27:17 2016 -0400 Committer: scnakandala <[email protected]> Committed: Wed Jul 13 13:27:17 2016 -0400 ---------------------------------------------------------------------- .../registry/core/experiment/catalog/resources/Utils.java | 10 ++++++++++ .../catalog/utils/ThriftDataModelConversion.java | 6 ++---- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/69631afc/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java ----------------------------------------------------------------------
