tree 6ed0b8fddd957ae9c1d09beedfb99aec67bcf2e8
parent a3e465970472d7b2d55d300b5f3fec3425be438b
parent 52b25896f7a923439b2996b3626e79dc650a8fc5
author Jon Hall <jhall@onlab.us> 1476822926 +0000
committer Gerrit Code Review <gerrit@onlab.us> 1476822926 +0000

Merge "[ONOS-5280] Update FUNCintent and [ONOS-5357] Add more encap types"