Merge branch 'master' of github.com:bigswitch/bigswitchcontroller

build.xml

lib/guava-13.0.1.jar

...floodlightcontroller/core/IFloodlightProviderService.java

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

...n/java/net/floodlightcontroller/core/IOFSwitchDriver.java

...main/java/net/floodlightcontroller/core/OFSwitchBase.java

.../floodlightcontroller/core/annotations/LogMessageDoc.java

...va/net/floodlightcontroller/core/internal/Controller.java

...floodlightcontroller/core/internal/IOFSwitchFeatures.java

...et/floodlightcontroller/core/internal/OFChannelState.java

.../net/floodlightcontroller/core/internal/OFSwitchImpl.java

...a/net/floodlightcontroller/core/internal/RoleChanger.java

...net/floodlightcontroller/core/web/SwitchRoleResource.java

...t/floodlightcontroller/devicemanager/internal/Device.java

...tcontroller/devicemanager/internal/DeviceManagerImpl.java

...t/floodlightcontroller/devicemanager/internal/Entity.java

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java

src/main/java/org/openflow/protocol/OFMatch.java

src/main/java/org/openflow/protocol/OFMessage.java

...n/java/org/openflow/protocol/OFStatisticsMessageBase.java