Merge branch 'master' into 'master'

Prepare for the release

See merge request entgra/carbon-device-mgt-plugins!178
kernel-4.4.x
Dharmakeerthi Lasantha 4 years ago
commit aee75d56fe

@ -253,6 +253,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return null;
}
@Override
public List<Device> getDevicesOfUser(String s, List<String> list, boolean b) throws DeviceManagementException {
return null;
}
@Override
public List<Device> getDevicesOfUser(String s, String s1) throws DeviceManagementException {
return null;
@ -273,6 +278,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return null;
}
@Override
public List<Device> getAllDevicesOfRole(String s, List<String> list, boolean b) throws DeviceManagementException {
return null;
}
@Override
public PaginationResult getDevicesByStatus(PaginationRequest paginationRequest) throws DeviceManagementException {
return null;

@ -1154,7 +1154,7 @@
<properties>
<!-- Carbon Device Management -->
<carbon.devicemgt.version>4.1.14</carbon.devicemgt.version>
<carbon.devicemgt.version>4.1.15</carbon.devicemgt.version>
<carbon.devicemgt.version.range>[4.0.0, 5.0.0)</carbon.devicemgt.version.range>
<!-- Carbon Device Management Plugins -->

Loading…
Cancel
Save