Draft update for Mininet 2.2b0

CONTRIBUTORS

@@ -7,32 +7,43 @@ or send a pull request.
 
 Contributors include:
 
-Mininet Core Team
+Mininet Core Team (and alumni)
 
 Bob Lantz
 Brandon Heller
 Nikhil Handigol
 Vimal Jeyakumar
 Brian O'Connor
+Cody Burkard
 
 Additional Mininet Contributors
 
+Tomasz Buchert
 Gustavo Pantuza Coelho Pinto
+Fernando Cappi
 Ryan Cox
 Shaun Crampton
 David Erickson
 Glen Gibb
 Andrew Ferguson
 Eder Leao Fernandes
+Gregory Gee
+Jon Hall
 Vitaly Ivanov
 Rich Lane
+Zi Shen Lim
 Murphy McCauley
 José Pedro Oliveira
 James Page
+Rich Lane
+Rémy Léone
 Angad Singh
 Piyush Srivastava
 Ed Swierk
+Darshan Thaker
+Andreas Wundsam
 Isaku Yamahata
+Baohua Yang
 
 Thanks also to everyone who has submitted issues and pull
 requests on github, and to our friendly mininet-discuss

INSTALL

@@ -2,7 +2,7 @@
 Mininet Installation/Configuration Notes
 ----------------------------------------
 
-Mininet 2.1.0+
+Mininet 2.2b0
 ---
 
 The supported installation methods for Mininet are 1) using a

LICENSE

@@ -1,4 +1,4 @@
-Mininet 2.1.0+ License
+Mininet 2.2b0 License
 
 Copyright (c) 2013 Open Networking Laboratory
 Copyright (c) 2009-2012 Bob Lantz and The Board of Trustees of

README.md

@@ -3,7 +3,7 @@ Mininet: Rapid Prototyping for Software Defined Networks
 
 *The best way to emulate almost any network on your laptop!*
 
-Version 2.1.0+
+Version 2.2b0
 
 ### What is Mininet?
 
@@ -66,28 +66,32 @@ Mininet includes:
 
   `mn -c`
 
-### New features in 2.1.0+
+### New features in 2.2b0
 
-Mininet 2.1.0+ provides a number of bug fixes as well as
+Mininet 2.2b0 provides a number of bug fixes as well as
 several new features, including:
 
-* Convenient access to `Mininet()` as a dict of nodes
+* Improved OpenFlow 1.3 support
-* X11 tunneling (wireshark in Mininet hosts, finally!)
-* Accurate reflection of the `Mininet()` object in the CLI
-* Automatically detecting and adjusting resource limits
-* Automatic cleanup on failure of the `mn` command
-* Preliminary support for running OVS in user space mode
-* Preliminary support (`IVSSwitch()`) for the Indigo Virtual Switch
-* support for installing the OpenFlow 1.3 versions of the reference
-  user switch and NOX from CPqD
-* The ability to import modules from `mininet.examples`
 
-We have provided several new examples (which can easily be
+	- `mn --switch ovs,protocols=openflow13` starts OVS in 1.3 mode
-imported to provide useful functionality) including:
+	- `install.sh -w` installs 1.3-compatible Wireshark dissector using
+	  Loxigen
+	- `install.sh -y` installs Ryu 1.3-compatible controller
 
-* Modeling separate control and data networks: `mininet.examples.controlnet`
+* A new `nodelib.py` node library, and new `Node` types including
-* Connecting Mininet hosts the internet (or a LAN) using NAT: `mininet.examples.nat`
+  `LinuxBridge`, `OVSBridge`, `LinuxRouter` and `NAT`
-* Creating per-host custom directories using bind mounts: `mininet.examples.bind`
+
+* An improved MiniEdit GUI (`examples/miniedit.py`) - thanks to
+  Gregory Gee
+
+* Experimental cluster support - consult the documentation for details,
+  as well as `examples/cluster.py` and an experimental `--cluster`
+  option for topologies built with the default `Host` and `OVSSwitch`
+  classes:
+
+  `mn --cluster localhost,server1,server2`
+
+[1] http://docs.mininet.org
 
 Note that examples contain experimental features which might
 "graduate" into mainline Mininet in the future, but they should 
@@ -113,21 +117,27 @@ Mininet mailing list, `mininet-discuss` at:
 
 <https://mailman.stanford.edu/mailman/listinfo/mininet-discuss>
 
-### Contributing
+### Join Us
 
 Mininet is an open source project and is currently hosted
 at <https://github.com/mininet>.  You are encouraged to download
 the code, examine it, modify it, and submit bug reports, bug fixes,
 feature requests, new features and other issues and pull requests.
-Thanks to everyone who has contributed to the project
+Thanks to everyone who has contributed code to the Mininet project
-(see CONTRIBUTORS for more info!)
+(see CONTRIBUTORS for more info!) It is because of everyone's
+hard work that Mininet continues to grow and improve.
+
+### Enjoy Mininet
 
 Best wishes, and we look forward to seeing what you can do with
 Mininet to change the networking world!
 
-### Credits
+The Mininet 2.2b0 Core Team:
-
-The Mininet 2.1.0+ Team:
 
 * Bob Lantz
 * Brian O'Connor
+* Cody Burkard
+
+Thanks again to all of the Mininet contributors, particularly Gregory
+Gee for his work on MiniEdit.
+

mininet/net.py

@@ -106,7 +106,7 @@ from mininet.util import macColonHex, ipStr, ipParse, netParse, ipAdd
 from mininet.term import cleanUpScreens, makeTerms
 
 # Mininet version: should be consistent with README and LICENSE
-VERSION = "2.1.0+"
+VERSION = "2.2b0"
 
 class Mininet( object ):
     "Network emulation with hosts spawned in network namespaces."