Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server

9 years ago · 078c14f746
parent fea8e23da0 424dd7979f
commit 078c14f746
3 changed files with 4 additions and 0 deletions
--- a/modules/distribution/src/repository/conf/api-manager.xml
+++ b/modules/distribution/src/repository/conf/api-manager.xml
@ -352,6 +352,10 @@
 		org.wso2.carbon.identity.oauth.tokenprocessor.EncryptionDecryptionPersistenceProcessor in the identity.xml -->
        <EncryptPersistedTokens>false</EncryptPersistedTokens>
        <ScopeWhitelist>
            <Scope>device_scope</Scope>
        </ScopeWhitelist>
    </APIKeyValidator>
    <!--
--- a/modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks
+++ b/modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks
--- a/modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2certs.jks
+++ b/modules/integration/tests-ui-integration/src/test/resources/keystores/stratos/wso2certs.jks