Commit Graph

2 Commits

Author SHA1 Message Date
Jan Bartel 93cc111a02 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
2011-07-25 17:42:30 +10:00
Michael Gorovoy 0cc914c4bb 352684 Implemented spinning thread analyzer 2011-07-20 19:30:44 -04:00