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/1ba83f11 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1ba83f11 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1ba83f11 Branch: refs/heads/master Commit: 1ba83f11f8bd0d5bda7bc1c6807e045774122a26 Parents: f837919 de84878 Author: Chathuri Wimalasena <[email protected]> Authored: Fri Jun 5 15:33:35 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Fri Jun 5 15:33:35 2015 -0400 ---------------------------------------------------------------------- distribution/src/main/assembly/bin-assembly.xml | 20 - .../gfac/bes/security/X509SecurityContext.java | 2 +- .../gfac/core/AbstractSecurityContext.java | 57 --- ...ava~30f9d70adbd9ee7dd6f7d3eccbfca4baf19b09fa | 475 ------------------- .../airavata/gfac/core/JobDescriptor.java~HEAD | 475 ------------------- ...ava~30f9d70adbd9ee7dd6f7d3eccbfca4baf19b09fa | 52 -- .../gfac/core/JobManagerConfiguration.java~HEAD | 52 -- ...ava~30f9d70adbd9ee7dd6f7d3eccbfca4baf19b09fa | 34 -- .../gfac/core/cluster/CommandInfo.java~HEAD | 34 -- ...ava~30f9d70adbd9ee7dd6f7d3eccbfca4baf19b09fa | 49 -- .../gfac/core/cluster/CommandOutput.java~HEAD | 49 -- ...ava~30f9d70adbd9ee7dd6f7d3eccbfca4baf19b09fa | 65 --- .../gfac/core/cluster/ServerInfo.java~HEAD | 65 --- .../core/context/AbstractSecurityContext.java | 59 +++ .../gsissh/security/GSISecurityContext.java | 2 +- 15 files changed, 61 insertions(+), 1429 deletions(-) ----------------------------------------------------------------------
