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

0fca30b3

Commit 0fca30b3 authored 13 years ago by Rob Adams

Downloads
- Plain Diff

Merge branch 'master' of github.com:floodlight/floodlight into newdevicemanager

Conflicts:
	src/main/resources/web/js/models/hostmodel.js

parents a7f4cc9a 3b804383

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/resources/web/js/main.js 13 additions, 5 deletions

src/main/resources/web/js/main.js
src/main/resources/web/js/models/hostmodel.js 6 additions, 2 deletions

src/main/resources/web/js/models/hostmodel.js
src/main/resources/web/js/models/switchmodel.js 20 additions, 13 deletions

src/main/resources/web/js/models/switchmodel.js
src/main/resources/web/js/views/switch.js 1 addition, 1 deletion

src/main/resources/web/js/views/switch.js
src/main/resources/web/js/views/topology.js 6 additions, 1 deletion

src/main/resources/web/js/views/topology.js
src/main/resources/web/tpl/switch-list-item.html 1 addition, 1 deletion

src/main/resources/web/tpl/switch-list-item.html
src/main/resources/web/tpl/switch-list.html 1 addition, 1 deletion

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

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