Merge remote-tracking branch 'apache/tomee-1.7.x' into activation-config-experimentation-17x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/823e5dd2 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/823e5dd2 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/823e5dd2 Branch: refs/heads/tomee-1.7.x Commit: 823e5dd2ccdf1d8eb78727e25be9c47d7d20f6b9 Parents: 6f33e6b 9820f54 Author: Jonathan Gallimore <[email protected]> Authored: Thu Aug 3 00:07:48 2017 +0100 Committer: Jonathan Gallimore <[email protected]> Committed: Thu Aug 3 00:07:48 2017 +0100 ---------------------------------------------------------------------- .../apache/openejb/config/ActivationConfigPropertyOverride.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
