tree d8579a2ef3a5d3ce06cbb8a9b12982589c69f048
parent c122569d75c9cbb6cf69f191411e6ba624ced0b0
parent 8dc6e25b894678c11da3489f52235d7fed1d46ab
author Jan Bartel <janb@webtide.com> 1454331552 +0100
committer Jan Bartel <janb@webtide.com> 1454331552 +0100

Merge branch 'master' into session-refactor

Conflicts:
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/MemSession.java
	jetty-server/src/test/java/org/eclipse/jetty/server/session/FileSessionManagerTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerDeleteSessionTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerPreserveSessionTest.java