Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

Conflicts: features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
9 years ago · a2c3813588
parent c6dce2f50f 1bbaac168b
commit a2c3813588
1 changed files with 2 additions and 2 deletions
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml
@ -53,9 +53,9 @@
        <API>
            <Name>deviceList</Name>
            <Owner>admin</Owner>
-            <Context>devices</Context>
+            <Context>mdm-admin/devices</Context>
            <Version>1.0.0</Version>
-            <Endpoint>http://localhost:9763/devices</Endpoint>
+            <Endpoint>http://localhost:9763/mdm-admin/devices</Endpoint>
            <Transports>http,https</Transports>
        </API>
    </APIs>