Merge branch 'develop' of 
https://git-wip-us.apache.org/repos/asf/incubator-geode into develop


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

Branch: refs/heads/develop
Commit: efd011750538ac2400cef8381765b8e0ddc921a1
Parents: 964ce83 d0f9dc3
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Tue Sep 20 05:59:12 2016 +1000
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Sep 20 05:59:12 2016 +1000

----------------------------------------------------------------------
 build.gradle                                    |   5 +-
 etc/eclipseOrganizeImports.importorder          |   5 +-
 etc/intellijIdeaCodeStyle.xml                   |   2 +
 .../LauncherLifecycleCommandsJUnitTest.java     |  52 +++--
 .../client/internal/ConnectionFactoryImpl.java  |  11 +-
 .../internal/IndexTrackingQueryObserver.java    |   2 +-
 .../distributed/ConfigurationProperties.java    |  17 --
 .../internal/AbstractDistributionConfig.java    |  26 ---
 .../internal/DistributionConfig.java            |  29 ---
 .../internal/DistributionConfigImpl.java        |  20 --
 .../membership/gms/auth/GMSAuthenticator.java   |  30 +--
 .../membership/gms/fd/GMSHealthMonitor.java     |   1 -
 .../internal/tcpserver/TcpClient.java           |   1 -
 .../internal/tcpserver/TcpServer.java           |   1 -
 .../apache/geode/internal/admin/SSLConfig.java  |   1 -
 .../internal/cache/AbstractDiskRegionEntry.java |   8 +-
 .../internal/cache/AbstractRegionEntry.java     |  31 ++-
 .../geode/internal/cache/AbstractRegionMap.java |   1 -
 .../geode/internal/cache/EntryEventImpl.java    |  92 +++++---
 .../cache/tier/sockets/AcceptorImpl.java        |   4 +-
 .../cache/tier/sockets/CacheClientProxy.java    |  12 +-
 .../internal/cache/tier/sockets/HandShake.java  |  26 ++-
 .../geode/internal/logging/LogService.java      |  11 +-
 .../geode/internal/logging/log4j/LogMarker.java |  48 ++--
 .../geode/internal/net/SocketCreator.java       |   1 -
 .../geode/internal/offheap/StoredObject.java    |   6 +
 .../security/IntegratedSecurityService.java     | 148 ++-----------
 .../internal/security/SecurableComponent.java   |  55 -----
 .../internal/security/SecurityService.java      |  87 +++++++-
 .../apache/geode/internal/tcp/TCPConduit.java   |   9 +-
 .../geode/management/GemFireProperties.java     |   1 -
 .../management/internal/ManagementAgent.java    |  13 +-
 .../apache/geode/security/AuthInitialize.java   |  16 +-
 .../geode/security/SecurableComponents.java     |  62 ------
 geode-core/src/main/resources/log4j2-cli.xml    |   6 +-
 geode-core/src/main/resources/log4j2.xml        |  11 +-
 .../internal/logging/log4j/log4j2-legacy.xml    |   6 +-
 .../CacheServerSSLConnectionDUnitTest.java      |   7 +-
 ...istributedAckOverflowRegionCCEDUnitTest.java |  22 +-
 .../DistributedAckRegionCCEDUnitTest.java       |   4 +-
 .../LocatorLauncherRemoteIntegrationTest.java   |  29 ++-
 .../ServerLauncherRemoteIntegrationTest.java    |  34 +--
 .../AbstractDistributionConfigTest.java         |  78 -------
 .../internal/DistributionConfigJUnitTest.java   |  89 +-------
 .../cache/ClientServerTransactionDUnitTest.java | 222 +++++++++++++++++--
 .../internal/cache/EntryEventImplTest.java      |   9 +
 .../cache/SearchLoadAndWriteProcessorTest.java  |   1 +
 .../security/IntegratedSecurityServiceTest.java | 163 +-------------
 .../security/SecurityConfigIntegrationTest.java |  57 -----
 .../ConnectToLocatorSSLDUnitTest.java           |   1 -
 .../geode/management/JMXMBeanDUnitTest.java     |   1 -
 ...edSecurityCacheLifecycleDistributedTest.java |  14 +-
 .../PDXGfshPostProcessorOnRemoteServerTest.java |  11 +-
 .../geode/codeAnalysis/excludedClasses.txt      |   1 -
 .../logging/log4j/custom/log4j2-custom.xml      |   5 +-
 .../geode/security/templates/authz5_5.dtd       |   8 +-
 .../geode/security/templates/authz6_0.dtd       |  10 +-
 .../apache/geode/test/golden/log4j2-test.xml    |   7 +-
 gradle/test.gradle                              |  18 +-
 59 files changed, 631 insertions(+), 1017 deletions(-)
----------------------------------------------------------------------


Reply via email to