[
https://issues.apache.org/jira/browse/GEODE-2439?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15883884#comment-15883884
]
ASF GitHub Bot commented on GEODE-2439:
---------------------------------------
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 <dkim...@pivotal.io>
Date: 2017-02-25T01:13:13Z
GEODE-2439: Fix build breaking merge from merge conflict
----
> Replace all non-standard types in all public includes / API
> -----------------------------------------------------------
>
> Key: GEODE-2439
> URL: https://issues.apache.org/jira/browse/GEODE-2439
> Project: Geode
> Issue Type: Bug
> Components: native client
> Reporter: Ernest Burghardt
>
> research other non-standard types in API, ACE_Time
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
