Merge remote-tracking branch 'origin/jetty-8'

Browse Source

Conflicts:
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-monitor/src/test/java/org/eclipse/jetty/monitor/AttrEventTriggerTest.java

...

This commit is contained in:

Greg Wilkins 2013-09-12 15:07:02 +10:00

parent 423dc1e443 de544ddfbf

commit 0e981d8d98

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available