Permalink
Browse files

Merge branch '2.0dev' into 2.0merge

Conflicts:
	.gitignore
	.pylint
	examples/miniedit.py
	mininet/node.py
	mininet/util.py
	util/install.sh
	util/vm/install-mininet-vm.sh
  • Loading branch information...
2 parents ad85e44 + 1f1d590 commit ab594b6afeaa7720e575df58eae44a1ee6d6215c @lantz lantz committed Nov 16, 2012
Showing with 5,394 additions and 1,542 deletions.
  1. +1 −0 .gitattributes
  2. +8 −0 .gitignore
  3. +10 −22 .pylint
  4. +64 −220 INSTALL
  5. +6 −2 LICENSE
  6. +46 −11 Makefile
  7. +0 −86 README
  8. +134 −0 README.md
  9. +108 −104 bin/mn
  10. +4 −4 custom/topo-2sw-2host.py
  11. +6 −0 debian/changelog
  12. +1 −0 debian/compat
  13. +29 −0 debian/control
  14. +33 −0 debian/copyright
  15. +1 −0 debian/docs
  16. +1 −0 debian/examples
  17. +1 −0 debian/install
  18. +1 −0 debian/manpages
  19. +9 −0 debian/rules
  20. +1 −0 debian/source/format
  21. +3 −0 debian/watch
  22. +3 −3 { → doc}/doxygen.cfg
  23. +47 −6 examples/README
  24. +8 −2 examples/baresshd.py
  25. +15 −24 examples/consoles.py
  26. +81 −0 examples/cpu.py
  27. +1 −1 examples/hwintf.py
  28. +53 −0 examples/limit.py
  29. +30 −32 examples/linearbandwidth.py
  30. +17 −28 examples/miniedit.py
  31. +86 −0 examples/multiping.py
  32. +81 −0 examples/multipoll.py
  33. +36 −0 examples/popen.py
  34. +33 −0 examples/popenpoll.py
  35. +28 −18 examples/scratchnet.py
  36. +16 −11 examples/scratchnetuser.py
  37. +49 −0 examples/simpleperf.py
  38. +4 −4 examples/sshd.py
  39. +2 −2 examples/treeping64.py
  40. +6 −0 mininet/clean.py
  41. +39 −29 mininet/cli.py
  42. +397 −0 mininet/link.py
  43. +6 −6 mininet/log.py
  44. +5 −5 mininet/moduledeps.py
  45. +351 −176 mininet/net.py
  46. +663 −278 mininet/node.py
  47. +127 −0 mininet/test/test_hifi.py
  48. +6 −17 mininet/test/test_nets.py
  49. +146 −321 mininet/topo.py
  50. +9 −18 mininet/topolib.py
  51. +290 −30 mininet/util.py
  52. +113 −13 mnexec.c
  53. +16 −9 setup.py
  54. +94 −0 util/build-ovs-packages.sh
  55. +1 −1 util/doxify.py
  56. +202 −58 util/install.sh
  57. +175 −0 util/nox-patches/0002-nox-ubuntu12-hacks.patch
  58. +2 −1 util/nox-patches/README
  59. +11 −0 util/sch_htb-ofbuf/Makefile
  60. +10 −0 util/sch_htb-ofbuf/README
  61. +1,644 −0 util/sch_htb-ofbuf/sch_htb.c
  62. +24 −0 util/versioncheck.py
View
@@ -0,0 +1 @@
+*.py diff=python
View
@@ -1,6 +1,14 @@
mnexec
*.pyc
*~
+*.1
+*.xcodeproj
+*.xcworkspace
+\#*\#
mininet.egg-info
build
dist
+doc/html
+doc/latex
+trunk
+
View
@@ -25,42 +25,30 @@ ignore=CVS
# Pickle collected data for later comparisons.
persistent=yes
-# Set the cache size for astng objects.
-cache-size=500
-
# List of plugins (as comma separated values of python modules names) to load,
# usually to register additional checkers.
load-plugins=
[MESSAGES CONTROL]
-# Enable only checker(s) with the given id(s). This option conflicts with the
-# disable-checker option
-#enable-checker=
-
-# Enable all checker(s) except those with the given id(s). This option
-# conflicts with the enable-checker option
-#disable-checker=
-
-# Enable all messages in the listed categories (IRCWEF).
-#enable-msg-cat=
-
-# Disable all messages in the listed categories (IRCWEF).
-disable-msg-cat=IR
-
-# Enable the message(s) with the given id(s).
-#enable-msg=
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time.
+#enable=
-# Disable the message(s) with the given id(s).
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once).
disable=W0704,C0103,W0231,E1102,W0511,W0142,R0902,R0903,R0904,R0913,R0914,R0801,I0011
[REPORTS]
# Set the output format. Available formats are text, parseable, colorized, msvs
# (visual studio) and html
-output-format=text
+output-format=colorized
# Include message's id in outpu
include-ids=yes
@@ -276,7 +264,7 @@ int-import-graph=
max-line-length=80
# Maximum number of lines in a module
-max-module-lines=1000
+max-module-lines=1500
# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
# tab).
Oops, something went wrong.

0 comments on commit ab594b6

Please sign in to comment.