Merge pull request #225 from Supun94/master

Support for Device Management Policy Merging
This commit is contained in:
Geeth 2016-12-22 11:13:00 +05:30 committed by GitHub
commit 1245c49d36
2 changed files with 5 additions and 1 deletions

View File

@ -704,7 +704,7 @@ org.wso2.carbon.server.admin_4.4.3.jar
org.wso2.carbon.service.mgt_4.6.0.jar bundle apache2 6318
org.wso2.carbon.siddhi.metrics.core_2.0.13.alpha.jar bundle apache2 7889
org.wso2.carbon.siddhi.tryit.ui_2.0.13.alpha.jar bundle apache2 7888
org.wso2.carbon.simple.policy.decision.point_1.1.0.SNAPSHOT.jar bundle apache2 7887
org.wso2.carbon.policy.decision.point_1.1.0.SNAPSHOT.jar bundle apache2 7887
org.wso2.carbon.social.core_1.4.1.jar bundle apache2 6316
org.wso2.carbon.social.db.adapter_1.4.1.jar bundle apache2 6315
org.wso2.carbon.social.sql_1.4.1.jar bundle apache2 6314

View File

@ -43,6 +43,10 @@
<MaxRetries>5</MaxRetries>
<MinRetriesToMarkUnreachable>8</MinRetriesToMarkUnreachable>
<MinRetriesToMarkInactive>20</MinRetriesToMarkInactive>
<!--Set the policy evaluation point name (Simple/Merged)-->
<!--Simple - Simple policy evaluation point-->
<!--Merged - Merged policy evaluation point -->
<PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>
</PolicyConfiguration>
<TaskConfiguration>
<Enable>true</Enable>