search for: bbfd79f

Displaying 2 results from an estimated 2 matches for "bbfd79f".

2014 Aug 10
2
Merging the DDL branch in nut-website
...l) \__ nut submodule (branch: master) \__ ddl submodule (branch unknown?) The "ddl" branch might be unknown since I have the nut-website master branch checked out, and I wasn't sure whether to mess with that. I get the following "git status" in ddl: "HEAD detached at bbfd79f". I would like to merge the ddl-hll branch back into master (and add DDL to the main "networkupstools" project), if it's ready. Is there anything else needed? Also, I would like to help add a few device dumps (such as the Eaton 5E), and it would be good to do that on the master...
2014 Aug 10
0
Merging the DDL branch in nut-website
...? > > nut-website (branch: dll-hll) > \__ nut submodule (branch: master) > \__ ddl submodule (branch unknown?) nut-website (branch: dll-hll) \__ nut submodule (branch: master @ abc0006 [not updated to avoid conflicts when merging back to master]) \__ ddl submodule (branch: master @ bbfd79f; now updated to ab6166c) > The "ddl" branch might be unknown since I have the nut-website master branch checked out, and I wasn't sure whether to mess with that. I get the following "git status" in ddl: "HEAD detached at bbfd79f". I didn't grab the last up...