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/05 19:39:16 UTC
[8/8] 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/11c090cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/11c090cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/11c090cf
Branch: refs/heads/feature/GEODE-1162
Commit: 11c090cf8864252268573fd8d6d77e77c20c1597
Parents: 69fd61f e92bf70
Author: Kirk Lund <kl...@apache.org>
Authored: Tue Apr 5 10:38:42 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue Apr 5 10:38:42 2016 -0700
----------------------------------------------------------------------
.../controllers/RestAPIsWithSSLDUnitTest.java | 160 ++++++-------
.../internal/cache/InitialImageOperation.java | 15 +-
.../gemfire/internal/cache/LocalRegion.java | 3 +
.../gemfire/internal/cache/TXCommitMessage.java | 18 +-
.../gemfire/internal/cache/TXEvent.java | 21 ++
.../gemfire/internal/cache/TXRmtEvent.java | 28 +++
.../gemfire/internal/cache/TXState.java | 12 +-
.../ServerToClientFunctionResultSender.java | 2 +-
.../internal/cache/ha/HAContainerRegion.java | 5 +
.../cache/tier/sockets/CacheClientNotifier.java | 58 +++--
.../cache/tier/sockets/ServerConnection.java | 61 +++--
.../gemfire/pdx/PdxSerializableDUnitTest.java | 106 +++++++++
.../src/test/resources/ssl/trusted.keystore | Bin 1176 -> 1078 bytes
.../src/test/resources/ssl/untrusted.keystore | Bin 1181 -> 1083 bytes
.../internal/cache/PutAllCSDUnitTest.java | 8 -
.../cache/wan/CacheClientNotifierDUnitTest.java | 225 +++++++++++++++++++
16 files changed, 564 insertions(+), 158 deletions(-)
----------------------------------------------------------------------