Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

floodlight
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

1de6c2e0

Commit 1de6c2e0 authored 12 years ago by abat

Downloads
- Plain Diff

Merge into master from pull request #281:

merge for reclassify without deleting (https://github.com/floodlight/floodlight/pull/281)

parents 268cd361 014f9c2a

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java 106 additions, 43 deletions

...tcontroller/devicemanager/internal/DeviceManagerImpl.java
src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java 125 additions, 0 deletions

...troller/devicemanager/internal/DeviceManagerImplTest.java
src/test/java/net/floodlightcontroller/devicemanager/test/MockFlexEntityClassifier.java 78 additions, 0 deletions

...ntroller/devicemanager/test/MockFlexEntityClassifier.java

with 309 additions and 43 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment