geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [50/50] [abbrv] incubator-geode git commit: Merge branch 'develop' into feature/GEODE-420
Date Tue, 13 Sep 2016 19:12:37 GMT
Merge branch 'develop' into feature/GEODE-420

# Conflicts:
#	geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt


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

Branch: refs/heads/develop
Commit: a325d074fd676e520dd9f7e565c77017de48d243
Parents: b6f429c 74e7732
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Wed Sep 14 05:09:19 2016 +1000
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Wed Sep 14 05:09:19 2016 +1000

----------------------------------------------------------------------
 .../modules/session/catalina/DeltaSession7.java | 599 +++++++++++++++++++
 .../catalina/Tomcat7DeltaSessionManager.java    |   6 +
 .../session/Tomcat7SessionsJUnitTest.java       |  40 ++
 .../modules/session/TestSessionsBase.java       |   4 +-
 .../internal/AbstractGroupOrRangeJunction.java  |   2 +-
 .../internal/index/CompactMapRangeIndex.java    |  11 +
 .../membership/gms/auth/GMSAuthenticator.java   |   4 +-
 .../internal/cache/tier/sockets/HandShake.java  |   4 +-
 .../internal/security/GeodeSecurityUtil.java    |  34 +-
 .../security/IntegratedSecurityService.java     |   5 +
 .../internal/security/SecurityService.java      |   1 +
 .../security/shiro/CustomAuthRealm.java         |  19 +-
 .../shiro/GeodeAuthenticationToken.java         |  41 ++
 .../security/shiro/JMXShiroAuthenticator.java   |  20 +-
 .../support/LoginHandlerInterceptor.java        |   7 +-
 .../dunit/CompactRangeIndexQueryDUnitTest.java  |  43 +-
 .../index/CompactRangeIndexJUnitTest.java       |  48 +-
 ...GMSAuthenticatorWithSecurityManagerTest.java |   8 +-
 .../security/IntegratedClientAuthDUnitTest.java |   2 +-
 .../gemfire/codeAnalysis/excludedClasses.txt    |   1 +
 gradle/dependency-versions.properties           |   2 +-
 21 files changed, 835 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a325d074/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt
----------------------------------------------------------------------
diff --cc geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt
index 4d27e43,5e1a3c9..a821897
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt
@@@ -153,5 -153,4 +153,6 @@@ com/gemstone/gemfire/internal/cache/ope
  org/apache/geode/security/ResourcePermission
  org/apache/geode/security/ResourcePermission$Operation
  org/apache/geode/security/ResourcePermission$Resource
 +com/gemstone/gemfire/distributed/internal/tcpserver/LocatorCancelException
 +com.gemstone.gemfire.internal.security.SecurableCommunicationChannel
+ com/gemstone/gemfire/internal/security/shiro/GeodeAuthenticationToken


Mime
View raw message