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

e2ff3bf5

Commit e2ff3bf5 authored 12 years ago by abat

Downloads
- Plain Diff

Merge into master from pull request #228:

Fix Links REST API and remove an unused serializer. (https://github.com/floodlight/floodlight/pull/228)

parents 6860c43f d54a1a56

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/web/serializers/OFMatchJSONSerializer.java 0 additions, 91 deletions

...ontroller/core/web/serializers/OFMatchJSONSerializer.java
src/main/java/net/floodlightcontroller/linkdiscovery/ILinkDiscovery.java 24 additions, 1 deletion

...et/floodlightcontroller/linkdiscovery/ILinkDiscovery.java
src/main/java/net/floodlightcontroller/linkdiscovery/web/LinkWithType.java 56 additions, 0 deletions

.../floodlightcontroller/linkdiscovery/web/LinkWithType.java
src/main/java/net/floodlightcontroller/linkdiscovery/web/LinksResource.java 1 addition, 30 deletions

...floodlightcontroller/linkdiscovery/web/LinksResource.java

with 81 additions and 122 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