Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 15C6719C34 for ; Thu, 14 Apr 2016 20:30:15 +0000 (UTC) Received: (qmail 50414 invoked by uid 500); 14 Apr 2016 20:30:15 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 50357 invoked by uid 500); 14 Apr 2016 20:30:15 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 50219 invoked by uid 99); 14 Apr 2016 20:30:15 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Apr 2016 20:30:15 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id E07DDC0FEC for ; Thu, 14 Apr 2016 20:30:14 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id JxqfiJ0ta81d for ; Thu, 14 Apr 2016 20:30:13 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 3204A5FDFB for ; Thu, 14 Apr 2016 20:30:13 +0000 (UTC) Received: (qmail 49572 invoked by uid 99); 14 Apr 2016 20:30:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Apr 2016 20:30:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 06A3FEAB4D; Thu, 14 Apr 2016 20:30:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Date: Thu, 14 Apr 2016 20:30:28 -0000 Message-Id: <92fa7c9b3c69499fa33543882d1a7cde@git.apache.org> In-Reply-To: <2f64b8dc99254234ba53d25d0b6d0c82@git.apache.org> References: <2f64b8dc99254234ba53d25d0b6d0c82@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Thu Apr 14 10:03:50 2016 -0700 Committer: Kirk Lund 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(-) ----------------------------------------------------------------------