Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/26be402c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/26be402c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/26be402c Branch: refs/heads/master Commit: 26be402c7af9cf4450a31eb7bbaad36cb49e5b94 Parents: 7933ea2 779f0cb Author: Lahiru Sandaruwan <[email protected]> Authored: Tue Jan 14 23:15:58 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Tue Jan 14 23:15:58 2014 +0530 ---------------------------------------------------------------------- .../stratos-manager/conf/sso-idp-config.xml | 59 ++++--- .../org.wso2.store.sso.common_1.0.0.jar | Bin 0 -> 13957 bytes ...so2.stratos.identity.saml2.sso.mgt_2.2.0.jar | Bin 0 -> 12276 bytes .../conf/temp-artifacts/sso/module.xml | 6 + .../temp-artifacts/sso/scripts/sso.client.js | 172 +++++++++++++++++++ .../modules/distribution/src/assembly/bin.xml | 20 +++ 6 files changed, 233 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
