Merge branch 'master' into tomee-7.0.0-M1
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b0c6422d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b0c6422d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b0c6422d Branch: refs/heads/tomee-7.0.0-M1 Commit: b0c6422d7e53234d35b9fb45854d3d64b2737e26 Parents: af2751f 638d32c Author: [email protected] <[email protected]> Authored: Mon Sep 21 21:10:32 2015 +0200 Committer: [email protected] <[email protected]> Committed: Mon Sep 21 21:10:32 2015 +0200 ---------------------------------------------------------------------- pom.xml | 2 +- .../java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
