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

e8b5694d

Commit e8b5694d authored 11 years ago by Gregor Maier

Downloads
- Plain Diff

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

parents fbbc698e ac8c11c1

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

build.xml 4 additions, 3 deletions

build.xml
setup-eclipse.sh 1 addition, 0 deletions

setup-eclipse.sh
src/main/java/net/floodlightcontroller/core/internal/Controller.java 1 addition, 1 deletion

...va/net/floodlightcontroller/core/internal/Controller.java
src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java 1 addition, 2 deletions

...odlightcontroller/core/module/FloodlightModuleLoader.java
src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule 1 addition, 5 deletions

...es/net.floodlightcontroller.core.module.IFloodlightModule
src/test/java/net/floodlightcontroller/core/module/FloodlightTestModuleLoader.java 2 additions, 6 deletions

...ghtcontroller/core/module/FloodlightTestModuleLoader.java
src/test/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule 4 additions, 0 deletions

...es/net.floodlightcontroller.core.module.IFloodlightModule

with 14 additions and 17 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