Merge branch 'GEODE-114' into feature/GEODE-9
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/89b9aaff Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/89b9aaff Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/89b9aaff Branch: refs/heads/develop Commit: 89b9aaff835cd3545a94bd5b06ce7f0a4c8a2b4b Parents: 60d074c dc1c155 Author: Qihong Chen <qc...@pivotal.io> Authored: Thu Jul 16 10:11:33 2015 -0700 Committer: Qihong Chen <qc...@pivotal.io> Committed: Thu Jul 16 10:11:33 2015 -0700 ---------------------------------------------------------------------- .../internal/DefaultGemFireConnection.scala | 8 ++++--- .../DefaultGemFireConnectionManager.scala | 24 ++++++++++++++------ 2 files changed, 22 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
