geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hiteshkhame...@apache.org
Subject [15/15] geode git commit: Merge branch 'release/1.1.0' into develop(updated KEYS file)
Date Thu, 16 Feb 2017 19:24:02 GMT
Merge branch 'release/1.1.0' into develop(updated KEYS file)

Conflicts:
	geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
	geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
	geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
	geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscBCDUnitTest.java
	geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigBaseTest.java
	geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDeployJarDUnitTest.java
	geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
	geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigWithSecurityDUnitTest.java
	geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java


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

Branch: refs/heads/develop
Commit: 686dd3a79adf831f711a54f8a5c41327e07c9dfb
Parents: f432e8e 2286fd0
Author: Hitesh Khamesra <hkhamesra@pivotal.io>
Authored: Thu Feb 16 11:24:31 2017 -0800
Committer: Hitesh Khamesra <hkhamesra@pivotal.io>
Committed: Thu Feb 16 11:24:31 2017 -0800

----------------------------------------------------------------------
 KEYS | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
----------------------------------------------------------------------



Mime
View raw message