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

8671b6af

Commit 8671b6af authored 12 years ago by abat

Downloads
- Plain Diff

Merge into master from pull request #184:

system uptime support (https://github.com/floodlight/floodlight/pull/184)

parents 6bfeba46 95034ba2

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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

...floodlightcontroller/core/IFloodlightProviderService.java
src/main/java/net/floodlightcontroller/core/internal/Controller.java 2 additions, 4 deletions

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

...t/floodlightcontroller/core/web/SystemUptimeResource.java
src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java 2 additions, 3 deletions

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

with 24 additions and 11 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