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

b9c596a4

Commit b9c596a4 authored 12 years ago by Gregor Maier

Downloads
- Plain Diff

Merge remote-tracking branch 'bigswitch/master' into misc

parents 45b18eab 345b3b86

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/net/floodlightcontroller/core/IFloodlightProviderService.java 11 additions, 0 deletions

...floodlightcontroller/core/IFloodlightProviderService.java
src/main/java/net/floodlightcontroller/core/internal/Controller.java 19 additions, 5 deletions

...va/net/floodlightcontroller/core/internal/Controller.java
src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java 20 additions, 21 deletions

...t/floodlightcontroller/core/web/SystemUptimeResource.java
src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java 5 additions, 4 deletions

...tcontroller/devicemanager/internal/DeviceManagerImpl.java
src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceUniqueIndex.java 8 additions, 8 deletions

...tcontroller/devicemanager/internal/DeviceUniqueIndex.java
src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java 16 additions, 0 deletions

...loodlightcontroller/core/test/MockFloodlightProvider.java

with 79 additions and 38 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