Merge branch 'tomee-1.7.x' of https://git-wip-us.apache.org/repos/asf/tomee into tomee-1.7.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/12de9c15 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/12de9c15 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/12de9c15 Branch: refs/heads/tomee-1.7.x Commit: 12de9c15695ef7a63e9bb275395c1e4dbf048f20 Parents: 744f268 0509993 Author: Jonathan Gallimore <j...@jrg.me.uk> Authored: Tue Apr 28 15:27:56 2015 +0000 Committer: Jonathan Gallimore <j...@jrg.me.uk> Committed: Tue Apr 28 15:27:56 2015 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/openejb/config/AutoConfig.java | 10 +++++----- pom.xml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/12de9c15/pom.xml ----------------------------------------------------------------------