GitHub user adamtracymartin opened a pull request:
https://github.com/apache/incubator-distributedlog/pull/116
DL-173 changed FileUtils.deleteDirectory to FileUtils.forceDeleteOnExit so
dâ¦
I am doing a new pull request because I deleted the branch in the remote.
Actions done to fix the conflict.
1. git checkout DL-73
2. git checkout master
distributedlog-protocol/src/main/thrift/service.thrift
3. git fetch
4. git add *
5. git commit with message
The actual fix for this branch is changing FileUtils.deleteDirectory to
FileUtils.forceDeleteOnExit.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/adamtracymartin/incubator-distributedlog
DL-173
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-distributedlog/pull/116.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 #116
----
commit d78c5b7f8a33ac0492953c56df13bd14f4ee3db8
Author: adamtracymartin <[email protected]>
Date: 2017-01-11T17:45:52Z
changed FileUtils.deleteDirectory to FileUtils.forceDeleteOnExit so
directory will delete on Windows.
----
---
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.
---
