Merge pull request #338 from kwanggithub/master

Fixes for subtree update

src/main/java/net/floodlightcontroller/core/IOFSwitch.java

@@ -446,13 +446,6 @@ public interface IOFSwitch {
      */
     public Lock getListenerWriteLock();
 
-    /**
-     * Get the IP Address for the switch
-     * @return the inet address
-     */
-    public SocketAddress getInetAddress();
-
-
     /***********************************************
      * The following method can be overridden by
      * specific types of switches

src/test/java/net/floodlightcontroller/util/OFMessageDamperMockSwitch.java

@@ -380,12 +380,6 @@ public class OFMessageDamperMockSwitch implements IOFSwitch {
         
     }
 
-    @Override
-    public SocketAddress getInetAddress() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
     @Override
     public OFPortType getPortType(short port_num) {
         // TODO Auto-generated method stub