You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/09/28 23:28:38 UTC

[3/6] incubator-geode git commit: Merge branch 'develop' into feature/GEODE-1801

Merge branch 'develop' into feature/GEODE-1801


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

Branch: refs/heads/develop
Commit: 4609eace077ccbb3cdd8bc83460c210032bfa75d
Parents: e29b775 6555c31
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue Sep 27 07:01:02 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Tue Sep 27 07:01:02 2016 +1000

----------------------------------------------------------------------
 .../geode/internal/net/SSLConfigurationFactory.java       |  2 +-
 .../java/org/apache/geode/internal/net/SocketCreator.java |  2 +-
 .../internal/configuration/domain/XmlEntity.java          | 10 +++++-----
 .../org/apache/geode/pdx/internal/PdxInstanceImpl.java    |  6 +++---
 geode-examples/gradle.properties                          |  4 ++--
 geode-spark-connector/project/Settings.scala              |  2 +-
 gradle/rat.gradle                                         |  1 +
 7 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------