tree e4679b65dd398c46ae86c92f3e4774f2ce2ee038
parent dad137420cdee3860b6cce459229b452b5aacc91
parent 9bf3d8f974923e8ef546f73432a4c4fd8e8884b7
author Jon Hall <jhall@onlab.us> 1433000947 -0700
committer Jon Hall <jhall@onlab.us> 1433000947 -0700

Merge pull request #125 from pingping-lin/master

update sdn-ip test to current master and onos1.2