You are viewing a plain text version of this content. The canonical link for it is here.
Posted to codereview@trafodion.apache.org by amandamoran <gi...@git.apache.org> on 2016/04/04 19:18:31 UTC

[GitHub] incubator-trafodion pull request: Fixing merge error

GitHub user amandamoran opened a pull request:

    https://github.com/apache/incubator-trafodion/pull/412

    Fixing merge error

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/amandamoran/incubator-trafodion installbugfixes

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-trafodion/pull/412.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 #412
    
----
commit ddd5fa0c8b60699a0957cd1cfa40129a0bee90a9
Author: Amanda Moran <am...@apache.com>
Date:   2016-04-04T17:17:22Z

    Fixing merge error

----


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-trafodion pull request: Fixing merge error

Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:

    https://github.com/apache/incubator-trafodion/pull/412


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---