Merge branch 'master' of https://github.com/wso2/product-iot-server into IoTS-1.0.0 # Conflicts: # modules/distribution/src/assembly/bin.xml # modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml # modules/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java # modules/p2-profile-gen/pom.xml # pom.xmlmerge-requests/1/head
parent
4d44095714
commit
b891a817e9
Loading…
Reference in new issue