Merge branch 'develop' into feature/GEODE-1938
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f91792cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f91792cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f91792cd Branch: refs/heads/develop Commit: f91792cd9c3531919b4d7ed0d0acd2d169fa68a1 Parents: 98c43a5 0a51d86 Author: Udo Kohlmeyer <ukohlme...@pivotal.io> Authored: Thu Oct 6 07:26:06 2016 +1100 Committer: Udo Kohlmeyer <ukohlme...@pivotal.io> Committed: Thu Oct 6 07:26:06 2016 +1100 ---------------------------------------------------------------------- .../cache/tier/sockets/BaseCommand.java | 7 ++-- .../geode/distributed/LocatorDUnitTest.java | 7 ---- .../LocatorUDPSecurityDUnitTest.java | 8 ---- .../logging/log4j/custom/log4j2-custom.xml | 3 +- ...oncurrentParallelGatewaySenderDUnitTest.java | 40 +++++++++++--------- 5 files changed, 27 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
