search

Codeprogrammers / codecraft-init-script

Linux Init script for launching a Minecraft server on system startup
codeprogrammers.net
GNU General Public License v2.0
21 stars 4 forks source link

+# 0.1.0 - ADD: Support for Ram Disk Type (ramfs, tmpfs). #9

Closed Paswaru closed 12 years ago

Paswaru commented 12 years ago

Adds support for ram disk types. It needs documentation to explain the impact and difference between the two.

tmpfs being fixed size, and ramfs being dynamic.

WillHaggerty commented 12 years ago

So are we accepting this change @Toasty27 ?

dghodgson commented 12 years ago

Yes, but I need to either find a simple way to resolve the merge conflict, or Paswaru will have to re-submit the pull requests without the readme.md file (which is causing the conflict). So far I have been able to resolve the conflict, but at the cost of denying Paswaru credit for his code, which isn't acceptable.

dghodgson commented 12 years ago

Alright I found a way to do it. Turns out that master's head on our repo is different from where he forked from. Didn't notice that earlier. I just made a branch on our repo from the point he forked from, pulled the changes from his repo, and it's all good to go. I'll merge it into develop and push to the github repo when I get some time later today.