[java-idp-jetty-base] 01/02: Merge branch '9.4' into 9.4-windows

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch 9.4-windows
in repository java-idp-jetty-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=261d45773058642cdddab6fd7152790051fc30fd

commit 261d45773058642cdddab6fd7152790051fc30fd
Merge: eddd76a a8df036
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Oct 10 14:00:56 2018 +0100

    Merge branch '9.4' into 9.4-windows

 pom.xml                                                   |  4 ++--
 src/main/resources/jetty-base/README.txt                  | 12 ------------
 src/main/resources/jetty-base/modules/idp-backchannel.mod |  4 ++++
 src/main/resources/jetty-base/modules/idp-logging.mod     |  4 ----
 src/main/resources/jetty-base/start.d/idp.ini             |  3 ---
 src/test/resources/jetty-base/webapps/idp.xml             |  2 +-
 6 files changed, 7 insertions(+), 22 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.