I was merging release/1.1.0 branch to develop to see if something we need to pull from there. Generally we don't expect anything from it but it is showing some conflicts. Can you(Bruce, Jenmei, Jared) please look following files.
-bash-4.2$ git merge --no-ff release/1.1.0Auto-merging gradle.properties Auto-merging geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java CONFLICT (content): Merge conflict in geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java Auto-merging geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java CONFLICT (content): Merge conflict in geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java Auto-merging geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java CONFLICT (content): Merge conflict in geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java Auto-merging geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java CONFLICT (content): Merge conflict in geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java Auto-merging geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigBaseTest.java CONFLICT (content): Merge conflict in geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigBaseTest.java Auto-merging geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java CONFLICT (content): Merge conflict in geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java Auto-merging geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java CONFLICT (content): Merge conflict in geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java Auto-merging geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java CONFLICT (content): Merge conflict in geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java Auto-merging geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java Auto-merging geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java CONFLICT (content): Merge conflict in geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java Automatic merge failed; fix conflicts and then commit the result. -bash-4.2$
