Merge remote-tracking branch 'apache/master' into otavio_poolwork

Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a1ef4a0f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a1ef4a0f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a1ef4a0f

Branch: refs/heads/fb_tomee8
Commit: a1ef4a0fe463f85888963ffe6ac5ceb6661c3da5
Parents: 9e62eaa d9f3ca8
Author: Thiago Veronezi <thi...@veronezi.org>
Authored: Mon Jan 15 09:21:54 2018 -0500
Committer: Thiago Veronezi <thi...@veronezi.org>
Committed: Mon Jan 15 09:21:54 2018 -0500

----------------------------------------------------------------------
 .../ActivationConfigPropertyOverride.java       | 29 +++++++++++++-
 .../ActivationConfigPropertyOverrideTest.java   | 42 +++++++++++++++++---
 2 files changed, 64 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


Reply via email to