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

4876b43f

Commit 4876b43f authored 14 years ago by Bob Lantz

Downloads
- Plain Diff

Merge branch 'of1.0' into testing

Conflicts:

	bin/mn
	mininet/cli.py
	mininet/moduledeps.py
	mininet/node.py
	mininet/topo.py
	util/install.sh

parents 6d2416ec 57fd19ef

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

INSTALL 161 additions, 46 deletions

INSTALL
bin/mn 31 additions, 1 deletion

bin/mn
examples/baresshd.py 26 additions, 0 deletions

examples/baresshd.py
examples/consoles.py 1 addition, 2 deletions

examples/consoles.py
examples/controllers.py 64 additions, 0 deletions

examples/controllers.py
mininet/cli.py 16 additions, 1 deletion

mininet/cli.py
mininet/moduledeps.py 11 additions, 9 deletions

mininet/moduledeps.py
mininet/net.py 20 additions, 10 deletions

mininet/net.py
mininet/node.py 33 additions, 18 deletions

mininet/node.py
util/install.sh 143 additions, 27 deletions

util/install.sh

with 506 additions and 114 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