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/1dc04ce7 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1dc04ce7 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1dc04ce7 Branch: refs/heads/master Commit: 1dc04ce7c4a2ac591c5168a26815f74d6f788bec Parents: 2736d75 119f754 Author: raminder <[email protected]> Authored: Mon Mar 3 15:29:33 2014 -0500 Committer: raminder <[email protected]> Committed: Mon Mar 3 15:29:33 2014 -0500 ---------------------------------------------------------------------- modules/airavata-job-monitor/pom.xml | 10 ++-------- .../airavata/job/monitor/util/X509Helper.java | 17 ++++++++--------- 2 files changed, 10 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
