Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mininet
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

786117dd

Commit 786117dd authored 11 years ago by Bob Lantz

Downloads
- Plain Diff

Merge branch 'ivs' of https://github.com/rlane/mininet into rlane-ivs

Conflicts:
	util/install.sh

fixes #159

parents 43ba774e 0a543602

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

bin/mn 3 additions, 2 deletions

bin/mn
mininet/clean.py 6 additions, 2 deletions

mininet/clean.py
mininet/node.py 58 additions, 0 deletions

mininet/node.py
mininet/test/test_hifi.py 21 additions, 10 deletions

mininet/test/test_hifi.py
mininet/test/test_nets.py 44 additions, 23 deletions

mininet/test/test_nets.py
util/install.sh 37 additions, 15 deletions

util/install.sh

with 169 additions and 52 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