Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9d80cf29 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9d80cf29 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9d80cf29 Branch: refs/heads/master Commit: 9d80cf2981915d908dfc1d37dd9b97fe8501d1c5 Parents: 8c84eee 9385c4e Author: Suresh Marru <[email protected]> Authored: Fri Mar 6 14:23:18 2015 -0500 Committer: Suresh Marru <[email protected]> Committed: Fri Mar 6 14:23:18 2015 -0500 ---------------------------------------------------------------------- .../org/apache/airavata/common/utils/DatabaseTestCases.java | 2 +- .../client/src/main/resources/airavata-client.properties | 2 +- .../server/src/main/resources/airavata-server.properties | 6 +++--- .../credential/store/store/impl/db/SSHCredentialTest.java | 2 +- .../src/main/resources/airavata-server.properties | 4 ++-- modules/security/src/test/resources/jdbc-authenticator.xml | 2 +- modules/security/src/test/resources/session-authenticator.xml | 2 +- tools/registry-tool/README | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
