floodlight/floodlight — pull request #477 by rizard (2014-12-30 21:02:10+00:00)
Title: Create v1.0 branch from openflow-1.3 branch

(1) a new v1.0 branch was created from master
(2) in my local repo, I pulled Floodlight's master to my openflow-1.3 branch with the "ours" merge strategy to effectively replace the master branch with our changes and avoid unnecessary manual conflict resolution.
(3) my local repo's openflow-1.3 branch was pushed up to my GitHub repo
(4) the pull request was then made (this) from my openflow-1.3 branch to the presently master v1.0 branch
(5) after the merge, the v1.0 branch should be the new OF1.3 code. I'd like to test though.