There are changes on develop to DirectChannel that aren't in the 1.1.0
branch. I don't see why git isn't figuring that out.
The backward-compatibility classes were modified in the 1.1.0 branch to
try to track down the problem with locating the classpaths file in
geode-old-versions. We could
Hi Hitesh,
It looks to me like the merge conflicts in ClusterConfig tests are due to this
commit being included in develop, but not in release/1.1.0: [d188118 Jinmei
Liao on 2/8/17 at 4:04 PM]
-Jared
> On Feb 14, 2017, at 12:16 PM, Hitesh Khamesra
> wrote:
>
> I was merging release/1.1.0
