This is an automated email from the ASF dual-hosted git repository. sai_boorlagadda pushed a commit to branch feature/GEODE-5212-specific-category in repository https://gitbox.apache.org/repos/asf/geode.git
commit c40dc55390b6e28baf5522a665ceb92ae47b4a78 Merge: 41e8503 6cedd25 Author: Sai Boorlagadda <[email protected]> AuthorDate: Mon Jul 23 14:27:03 2018 -0700 Merge branch 'develop' into feature/GEODE-5212-specific-category ci/images/google-geode-builder/scripts/setup.sh | 2 +- ...PersistentPartitionedRegionDistributedTest.java | 7 +- .../tier/sockets/ClientServerMiscDUnitTest.java | 279 +++----- .../ClientServerJTAFailoverDistributedTest.java | 270 ++++++++ ...precatedCacheServerLauncherIntegrationTest.java | 22 +- .../cache/backup/BackupIntegrationTest.java | 14 +- .../cache/backup/UnixScriptGeneratorTest.java | 5 +- .../cache/tier/sockets/CacheServerTestUtil.java | 4 + .../cli/commands/StartMemberUtilsTest.java | 13 +- .../apache/geode/pdx/PdxAttributesJUnitTest.java | 6 +- .../cache/client/internal/EndpointManager.java | 2 +- .../org/apache/geode/internal/MigrationClient.java | 261 -------- .../org/apache/geode/internal/MigrationServer.java | 559 ----------------- .../cache/DistTXStateProxyImplOnCoordinator.java | 6 - .../internal/cache/PausedTXStateProxyImpl.java | 8 - .../apache/geode/internal/cache/TXManagerImpl.java | 4 + .../org/apache/geode/internal/cache/TXState.java | 99 +-- .../apache/geode/internal/cache/TXStateProxy.java | 9 - .../geode/internal/cache/TXStateProxyImpl.java | 25 - .../internal/cache/TXSynchronizationRunnable.java | 152 ----- .../internal/cache/backup/BackupWriterFactory.java | 2 + .../internal/cache/backup/UnixScriptGenerator.java | 4 +- .../cache/backup/WindowsScriptGenerator.java | 16 +- .../sockets/command/TXSynchronizationCommand.java | 235 +++---- .../geode/internal/cache/tx/ClientTXStateStub.java | 4 + .../apache/geode/internal/cache/TXStateTest.java | 108 ++++ .../cache/TXSynchronizationRunnableTest.java | 61 -- .../command/TXSynchronizationCommandTest.java | 116 ++++ .../apache/geode/test/process/ProcessWrapper.java | 75 ++- .../tier/sockets/DurableClientCrashDUnitTest.java | 6 +- .../tier/sockets/DurableClientSimpleDUnitTest.java | 698 ++++++++++----------- .../cache/tier/sockets/DurableClientTestCase.java | 508 ++++++--------- .../managing/security/enable_security.html.md.erb | 6 + .../apache/geode/experimental/driver/SSLTest.java | 6 +- gradle/test.gradle | 5 + 35 files changed, 1397 insertions(+), 2200 deletions(-)
