diff options
author | Jan Bartel | 2016-02-01 12:59:12 +0000 |
---|---|---|
committer | Jan Bartel | 2016-02-01 12:59:12 +0000 |
commit | a8c29334caf1f26e40f2fb3e8b93546523065cfa (patch) | |
tree | d8579a2ef3a5d3ce06cbb8a9b12982589c69f048 /jetty-monitor/src/main/java/org/eclipse/jetty/monitor/jmx/LoggingNotifier.java | |
parent | c122569d75c9cbb6cf69f191411e6ba624ced0b0 (diff) | |
parent | 8dc6e25b894678c11da3489f52235d7fed1d46ab (diff) | |
download | org.eclipse.jetty.project-a8c29334caf1f26e40f2fb3e8b93546523065cfa.tar.gz org.eclipse.jetty.project-a8c29334caf1f26e40f2fb3e8b93546523065cfa.tar.xz org.eclipse.jetty.project-a8c29334caf1f26e40f2fb3e8b93546523065cfa.zip |
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
Diffstat (limited to 'jetty-monitor/src/main/java/org/eclipse/jetty/monitor/jmx/LoggingNotifier.java')
-rw-r--r-- | jetty-monitor/src/main/java/org/eclipse/jetty/monitor/jmx/LoggingNotifier.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-monitor/src/main/java/org/eclipse/jetty/monitor/jmx/LoggingNotifier.java b/jetty-monitor/src/main/java/org/eclipse/jetty/monitor/jmx/LoggingNotifier.java index 164b806598..b78f7a34e8 100644 --- a/jetty-monitor/src/main/java/org/eclipse/jetty/monitor/jmx/LoggingNotifier.java +++ b/jetty-monitor/src/main/java/org/eclipse/jetty/monitor/jmx/LoggingNotifier.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd. // ------------------------------------------------------------------------ // All rights reserved. This program and the accompanying materials // are made available under the terms of the Eclipse Public License v1.0 |