Jan Bartel a8c29334ca 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		2016-02-01 13:59:12 +01:00
..
src/main	Merge branch 'master' into session-refactor	2016-02-01 13:59:12 +01:00
pom.xml	Updating to version 9.3.7-SNAPSHOT	2015-11-06 12:13:00 -07:00