You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@roller.apache.org by sn...@apache.org on 2019/06/09 19:49:27 UTC

[roller] branch bootstrap-ui updated (f7eaaca -> 6a1c12e)

This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a change to branch bootstrap-ui
in repository https://gitbox.apache.org/repos/asf/roller.git.


    from f7eaaca  Improvements to Dockerfile and Docker Compose setup.
     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.
     add a963bb1  Merge branch 'roller-5.2.x'
     add 6a1c12e  Merge branch 'master' into bootstrap-ui

No new revisions were added by this update.

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       | 10 ++++++
 app/src/test/resources/jetty.xml                   | 42 +++++++++++++++-------
 app/src/test/resources/jndi.properties             |  4 ---
 7 files changed, 48 insertions(+), 22 deletions(-)
 delete mode 100644 app/src/test/resources/jndi.properties