Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/dfa2f22e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/dfa2f22e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/dfa2f22e Branch: refs/heads/master Commit: dfa2f22e282bac82ec03d2ac76bfc87edcbf99d1 Parents: ce62a61 831dbdc Author: shamrath <[email protected]> Authored: Tue Nov 11 18:55:44 2014 -0500 Committer: shamrath <[email protected]> Committed: Tue Nov 11 18:55:44 2014 -0500 ---------------------------------------------------------------------- .../catalog/data/util/AppCatalogThriftConversion.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
