This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git.
from 88f02b9 More remember-me fixes.
add 331b3eb Simplification of recent remember-me fix.
add b668319 More remember-me fixes.
add db21732 Minor working and formatting changes.
add 41ba970 Skip feed fetcher tests on Java 1.7 which does not support
TLS 1.2.
add 1e25666 Fix regression that was preventing mvn jetty:run from working
properly.
add f0433b7 Prepare for rc-2.
new a963bb1 Merge branch 'roller-5.2.x'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
app/pom.xml | 6 ++++
.../roller/weblogger/ui/core/RollerContext.java | 2 --
.../RollerRememberMeAuthenticationProvider.java | 2 +-
.../ui/core/security/RollerRememberMeServices.java | 4 +--
.../planet/business/RomeFeedFetcherTest.java | 27 +++++++++++---
.../business/SingleThreadedFeedUpdaterTest.java | 7 +++-
app/src/test/resources/jetty.xml | 42 +++++++++++++++-------
app/src/test/resources/jndi.properties | 4 ---
8 files changed, 66 insertions(+), 28 deletions(-)
delete mode 100644 app/src/test/resources/jndi.properties
