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

6df2eb39

Commit 6df2eb39 authored 10 years ago by Ryan Izard

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/rizard/floodlight

Pull in Hung-Wei's WEBUI changes. Then, push Ryan's unit test changes to remote again.

parents be3be8d0 05b4b94c

No related branches found

No related tags found

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/net/floodlightcontroller/core/web/ControllerSwitchesResource.java 39 additions, 5 deletions

...dlightcontroller/core/web/ControllerSwitchesResource.java
src/main/java/net/floodlightcontroller/core/web/SwitchResourceBase.java 3 additions, 1 deletion

...net/floodlightcontroller/core/web/SwitchResourceBase.java
src/main/java/net/floodlightcontroller/core/web/SwitchStatisticsResource.java 1 addition, 1 deletion

...oodlightcontroller/core/web/SwitchStatisticsResource.java
src/main/java/net/floodlightcontroller/core/web/serializers/StatsReplySerializer.java 583 additions, 446 deletions

...controller/core/web/serializers/StatsReplySerializer.java
src/main/resources/web/js/models/switchmodel.js 33 additions, 84 deletions

src/main/resources/web/js/models/switchmodel.js
src/main/resources/web/tpl/flow-list-item.html 1 addition, 1 deletion

src/main/resources/web/tpl/flow-list-item.html
src/main/resources/web/tpl/flow-list.html 2 additions, 2 deletions

src/main/resources/web/tpl/flow-list.html

with 662 additions and 540 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