GitHub user dgkimura opened a pull request:
https://github.com/apache/geode-native/pull/35
GEODE-2439: Fix build breaking merge from merge conflict
Build broke after bad merge with commits: GEODE-2439 and GEODE-2440.
Conflict was resolved incorrectly by accidentally removing the signed-ness.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/dgkimura/geode-native fix-build-break
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/geode-native/pull/35.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #35
----
commit 258c5e39425f00f0dff67776c582811e9274e97f
Author: David Kimura <[email protected]>
Date: 2017-02-25T01:13:13Z
GEODE-2439: Fix build breaking merge from merge conflict
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
