tree 3b367afa39f44bb596cdcd4029980ccc0b5f3ab6
parent b172d5fc8eef7877a1a3beec49e22221ceb069e6
author kmcpeake <kmcpeake@btisystems.com> 1450701397 +0000
committer kmcpeake <kmcpeake@btisystems.com> 1450701397 +0000

[ONOS-3203] Migrate to 1.5.0-SNAPHOT

Fix merge problem with Change-Id: If9ce4ca5f5f6d089e9f088e710367f4e2ca1c9b6

Change-Id: I56a5b7c67085c1cd31a7274ece55f962e908d01b