geode-commits mailing list archives

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

# Conflicts:
#	geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java


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

Branch: refs/heads/develop
Commit: 59adbcc0341f1e54f546ce180a89c059cbf8e1a1
Parents: a455526 7f4992c
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Fri Aug 26 09:27:13 2016 +1000
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Fri Aug 26 09:27:13 2016 +1000

----------------------------------------------------------------------
 build.gradle                                    |   1 -
 .../SessionExpirationCacheListener.java         |   6 +-
 geode-core/build.gradle                         |  33 -
 .../distributed/internal/StartupMessage.java    |  14 -
 .../gemfire/internal/GemFireVersion.java        | 726 +++++--------------
 .../gemstone/gemfire/internal/SystemAdmin.java  |  10 +-
 .../security/shiro/CustomAuthRealm.java         |   2 +-
 .../apache/geode/security/SecurityManager.java  |   5 +-
 .../templates/SampleSecurityManager.java        |   5 +-
 .../internal/GemFireVersionJUnitTest.java       |  75 +-
 .../gemfire/internal/VersionJUnitTest.java      |  50 ++
 .../gemfire/security/SpySecurityManager.java    |   3 +-
 gradle/utilities.gradle                         |  43 ++
 13 files changed, 283 insertions(+), 690 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/59adbcc0/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/59adbcc0/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
----------------------------------------------------------------------


Mime
View raw message