merging pull request for AIRAVATA-2163
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6867673f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6867673f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6867673f Branch: refs/heads/develop Commit: 6867673ff75fc0d486d870e66a0e00c92a1c4f1b Parents: 9eede35 9865e7e Author: scnakandala <[email protected]> Authored: Tue Dec 13 14:52:44 2016 -0500 Committer: scnakandala <[email protected]> Committed: Tue Dec 13 14:52:44 2016 -0500 ---------------------------------------------------------------------- .../resources/lib/Airavata/API/Airavata.php | 160 +++++++++++++------ .../Airavata/Model/Credential/Store/Types.php | 76 ++++++--- .../server/CredentialStoreServerHandler.java | 3 + 3 files changed, 168 insertions(+), 71 deletions(-) ----------------------------------------------------------------------
