From 8d4b340ec87c80f357ea9cace9e5885da13d1079 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 14 Sep 2015 09:18:38 +0200 Subject: [PATCH] BUG-865: Remove ModificationType.MERGE MERGE type has been deprecated in Lithium and has not been emitted anywhere. Change-Id: I91584ce6ac75bedab2fec257ec4ac2e80cbdc895 Signed-off-by: Robert Varga --- .../yang/data/api/schema/tree/ModificationType.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/ModificationType.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/ModificationType.java index 3c2c299fff..64cc4f526b 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/ModificationType.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/ModificationType.java @@ -34,17 +34,4 @@ public enum ModificationType { * This node has been deleted along with any of its child nodes. */ DELETE, - - /** - * Node has been written into the tree, but instead of replacing pre-existing - * contents, it has been merged. This means that any incoming nodes which - * were present in the tree have been replaced, but their child nodes have - * been retained. - * - * @deprecated This value is never reported. Whenever it would be reported, based - * on the actual effects, either {@link #WRITE} or {@link #SUBTREE_MODIFIED} - * is reported. - */ - @Deprecated - MERGE, } -- 2.36.6