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

Browse Source

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java

...

This commit is contained in:

Jan Bartel 2013-05-16 12:33:08 +10:00

parent 9c168866ff 4a562f8d89

commit 76b767fc22

1 changed files with 3 additions and 3 deletions

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