You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/04/14 22:30:28 UTC

[18/18] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-1162

Merge remote-tracking branch 'origin/develop' into feature/GEODE-1162


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

Branch: refs/heads/feature/GEODE-1162
Commit: e2813de4037f23647ee315975d0ab42e7865f9fb
Parents: d9344e0 7b3c8cb
Author: Kirk Lund <kl...@apache.org>
Authored: Thu Apr 14 10:03:50 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Thu Apr 14 10:03:50 2016 -0700

----------------------------------------------------------------------
 geode-core/build.gradle                         |   8 +-
 .../client/internal/CloseConnectionOp.java      |   0
 .../cache/client/internal/ConnectionImpl.java   |   8 +-
 .../internal/membership/gms/Services.java       |  23 +-
 .../membership/gms/fd/GMSHealthMonitor.java     |  20 +-
 .../gms/messenger/JGroupsMessenger.java         |   2 +-
 .../membership/gms/messenger/StatRecorder.java  |  30 +-
 .../gemfire/internal/SocketCreator.java         |  25 +-
 .../gemfire/internal/SocketIOWithTimeout.java   | 491 -------------------
 .../gemfire/internal/SocketInputStream.java     | 181 -------
 .../gemfire/internal/SocketInputWrapper.java    |  93 ----
 .../gemfire/internal/SocketOutputStream.java    | 174 -------
 .../gemstone/gemfire/internal/SocketUtils.java  | 220 ---------
 .../gemfire/internal/cache/EntryEventImpl.java  |   4 +-
 .../internal/cache/GemFireCacheImpl.java        |  14 +-
 .../cache/SearchLoadAndWriteProcessor.java      |  28 +-
 .../cache/execute/util/CommitFunction.java      | 141 ------
 .../execute/util/NestedTransactionFunction.java | 116 -----
 .../cache/execute/util/RollbackFunction.java    | 136 -----
 .../cache/tier/sockets/AcceptorImpl.java        |   3 +-
 .../cache/tier/sockets/CacheClientNotifier.java | 105 +---
 .../cache/tier/sockets/CacheClientUpdater.java  |   5 +-
 .../internal/cache/tier/sockets/HandShake.java  |  13 +-
 .../internal/cache/tier/sockets/Message.java    |   3 +-
 .../cache/tier/sockets/ServerConnection.java    |   5 +-
 .../tier/sockets/ServerHandShakeProcessor.java  |  26 +-
 .../tier/sockets/command/CloseConnection.java   |   0
 .../serial/SerialSecondaryGatewayListener.java  |  19 +-
 .../gemfire/internal/shared/NativeCalls.java    |   2 +-
 .../gemfire/internal/tcp/Connection.java        |   5 +-
 .../gemfire/management/internal/RestAgent.java  |  51 +-
 .../distributed/DistributedSystemDUnitTest.java |  20 +-
 .../gms/membership/StatRecorderJUnitTest.java   |  67 ++-
 .../gemstone/gemfire/internal/ClassBuilder.java |  13 +-
 .../internal/JarClassLoaderJUnitTest.java       |  17 +
 .../cache/ClientServerTransactionDUnitTest.java |   2 -
 .../gemfire/internal/cache/CommitFunction.java  | 142 ++++++
 .../internal/cache/EntryEventImplTest.java      |  71 +++
 .../cache/NestedTransactionFunction.java        | 116 +++++
 .../internal/cache/RollbackFunction.java        | 137 ++++++
 .../cache/SearchLoadAndWriteProcessorTest.java  |  68 +++
 .../internal/directory/RegionDirectory.java     |  20 +-
 .../lucene/internal/filesystem/FileSystem.java  |   5 +
 .../repository/IndexRepositoryImpl.java         |   2 +-
 .../repository/serializer/SerializerUtil.java   |  16 +-
 .../LuceneIndexRecoveryHAJUnitTest.java         |  20 +-
 .../internal/LuceneServiceImplJUnitTest.java    |  44 +-
 .../IndexRepositoryImplPerformanceTest.java     |   4 +-
 geode-site/website/Rules                        |   6 +
 geode-site/website/layouts/default.html         |   2 +-
 geode-site/website/layouts/header.html          |   2 +-
 geode-site/website/layouts/releases.html        |   1 +
 .../web/swagger/config/RestApiPathProvider.java |  27 +-
 gradle/dependency-versions.properties           |   2 +-
 54 files changed, 916 insertions(+), 1839 deletions(-)
----------------------------------------------------------------------