Conversation
recommened on the mailing list.
Changing Mood switches to work as Numbers rather than strings as
Adding first commit of empty Lightwaverf module
Conflicts: bundles/binding/pom.xml
Merge from Master
Conflicts: bundles/binding/pom.xml
…lightwaverf Conflicts: bundles/binding/pom.xml
first implementations of sender and receiver
…er that isn't needed
} | ||
|
||
private void publishUpdate(List<String> itemNames, LightwaveRFCommand message, LightwaveRfBindingProvider provider) { | ||
logger.info("Publishing Update {} to {}",message, itemNames); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
decrease to DEBUG level
Hi @foxy82, please find my review comments inline and some general comments below.
And finally squash your commits into one once you've incorporated my feedback. Thanks, Thomas E.-E. |
openhab » openhab #3020 FAILURE |
if you could finally squash your commits into one i am ready to merge … Thanks, Thomas E.-E. |
any chance to get this squashed today? |
Hey, I'll try to do it later today. Neil
|
@foxy82 ? |
Hi, I've incorporated the following: fixed javadoc, fixed headers, removed tests from the binding directory, formatting. I haven't done the comments for public methods yet or squashed it into one commit. I need to go out now I'll try to do the squash in about 3 hours. If you need this today I'm not likely to be able to add the comments that will need to be a later update. |
openhab » openhab #3060 FAILURE |
ok, thanks! The most important thing would be to squash your commits into one and to create the according wiki page. Best, Thomas E.-E. |
I'm trying to squash now but I don't know Git very well. I'm following this: http://blog.steveklabnik.com/posts/2012-11-08-how-to-squash-commits-in-a-github-pull-request but something must be going wrong as loads of commits are conflicting I've only managed to get to 10 of 121 if it persists at this pace I'm not going to have time to do it. If there is anything wrong with those instructions let me know. |
we generally recommend this howto: https://github.com/ginatrapani/todo.txt-android/wiki/Squash-All-Commits-Related-to-a-Single-Issue-into-a-Single-Commit |
i can squash for you but then i will be author here on github. If you are fine with that we can go that way, too … |
Following that - I don't know how to find how many commits I need for the HEAD~4 bit just done 20 commits successfully but now it is asking about merge conflicts in db4o modules. I wonder if I've mucked up my fork when trying to pull in upstream changes. |
Update openhab_default.cfg Updated with lightwaverf settings Updated with correct case Log when we don't use a message. Updated Updated Updated to publish message when no config Update AbstractLightwaveRfCommand.java Add License header and @author and @SInCE tags Update LightwaveRFActivator.java Fix since tag Update LightwaveRFReceiver.java Add License header and @authoer and @SInCE tags Update LightwaveRFSender.java Add License header and @author and @SInCE tags Update LightwaveRfHeatPoller.java Add License header and @author and @SInCE tags Update LightwaveRfType.java Add License header and @author and @SInCE tags Update LightwaverfConvertor.java Add License header and @author and @SInCE tags Update LightwaveRfMessageException.java Add License header and @author and @SInCE tags Update LightwaveRFMessageListener.java Add License header and @author and @SInCE tags Update LightwaveRfDeviceId.java Add License header and @author and @SInCE tags Update LightwaveRfGeneralMessageId.java Add License header and @author and @SInCE tags Update LightwaveRfHeatingMessageId.java Add License header and @author and @SInCE tags Update LightwaveRfMessageId.java Add License header and @author and @SInCE tags Update LightwaveRfRoomDeviceIdentifier.java Add License header and @author and @SInCE tags Update LightwaveRFCommand.java Add License header and @author and @SInCE tags Update LightwaveRFStopPublisherCommand.java Add License header and @author and @SInCE tags Update LightwaveRfCommandOk.java Add License header and @author and @SInCE tags Update LightwaveRfDeviceRegistrationCommand.java Add License header and @author and @SInCE tags Update LightwaveRfDimCommand.java Add License header and @author and @SInCE tags Update LightwaveRfHeatInfoRequest.java Add License header and @author and @SInCE tags Update LightwaveRfHeatingInfoResponse.java Add License header and @author and @SInCE tags Update LightwaveRfMessageType.java Add License header and @author and @SInCE tags Update LightwaveRfOnOffCommand.java Add License header and @author and @SInCE tags Update LightwaveRfRoomDeviceMessage.java Add License header and @author and @SInCE tags Update LightwaveRfRoomMessage.java Add License header and @author and @SInCE tags Update LightwaveRfSerialMessage.java Add License header and @author and @SInCE tags Update LightwaveRfSetHeatingTemperatureCommand.java Add License header and @author and @SInCE tags Update LightwaveRfVersionMessage.java Add License header and @author and @SInCE tags Update MANIFEST.MF Remove export line Update AbstractLightwaveRfCommand.java Adding documentation of class use Update LightwaveRFReceiver.java Update documentation Update LightwaveRFSender.java Update comments Update LightwaverfConvertor.java Update comments Update LightwaveRfType.java Update comments Update LightwaveRfHeatPoller.java Update comments Update LightwaveRfBinding.java Downgraded log level. Removed generic comments. Update LightwaveRfHeatingInfoResponse.java Move comment to class level Update LightwaveRfOnOffCommand.java Move comment. Update LightwaveRfSetHeatingTemperatureCommand.java Update comments and remove commented code. Update LightwaveRFSenderTest.java Remove comments. Update LightwaveRFSender.java Fix comments Move tests to a seperate directory and format code. Fix header date to 2015 Added lightwaverf to distributionn/pom.xml
I've managed to squash some but the next one is just conflicting really badly - I don't know why - all I want is all files in the status they are in the very last commit as a single commit for the whole binding. I don't have time to do any more I'll have to look again if I get some time next week. I don't mind if you are able to squash them and it sets you as the author - or if you know a simple command I can run to just flatten it taking the HEAD as the final copy and not worrying about the merge conflicts in the middle. |
openhab » openhab #3063 FAILURE |
openhab » openhab #3064 FAILURE |
openhab » openhab #3065 FAILURE |
i've merged this PR manually. Please keep in mind to create the according Wiki page and link to it here and on the Release-Notes page (see https://github.com/openhab/openhab/wiki/Release-Notes-1.7). Thanks, Thomas E.-E. |
No description provided.