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

# Resolving Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
7 years ago · 7cdea248f7
parent 7f9cf0ffea
commit 7cdea248f7
1 changed files with 1 additions and 0 deletions
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
@ -55,6 +55,7 @@ public final class DeviceManagementConfig {
    private OperationAnalyticsConfiguration operationAnalyticsConfiguration;
    private String defaultGroupsConfiguration;
    private RemoteSessionConfiguration remoteSessionConfiguration;
+    private ArchivalConfiguration archivalConfiguration;


    @XmlElement(name = "ManagementRepository", required = true)