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/639e8910 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/639e8910 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/639e8910 Branch: refs/heads/develop Commit: 639e8910e3770153f8dc4521b9d2e4fc3c12e420 Parents: 69631af 1bf88d5 Author: scnakandala <[email protected]> Authored: Thu Jul 14 01:16:20 2016 -0400 Committer: scnakandala <[email protected]> Committed: Thu Jul 14 01:16:20 2016 -0400 ---------------------------------------------------------------------- .../registry/core/experiment/catalog/impl/GatewayRegistry.java | 2 ++ pom.xml | 1 + 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/639e8910/pom.xml ----------------------------------------------------------------------
