/*
 * Copyright 2015 Open Networking Laboratory
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.onosproject.store.intent.impl;

import org.onosproject.net.intent.IntentData;
import org.onosproject.store.Timestamp;
import org.onosproject.store.impl.ClockService;

/**
 * ClockService that uses IntentData versions as timestamps.
 */
public class IntentDataClockManager<K> implements ClockService<K, IntentData> {
    @Override
    public Timestamp getTimestamp(K key, IntentData intentData) {
        return intentData.version();
    }
}

@@ -780,16 +780,72 @@
 Service;
+%0Aimport org.onosproject.store.impl.MultiValuedTimestamp;
 %0A%0A/**%0A *
@@ -1086,27 +1086,74 @@
 urn 
-intentData.version(
+new MultiValuedTimestamp%3C%3E(intentData.version(), System.nanoTime()
 );%0A 

Fix entries getting stuck in the pending map.