https://github.com/thormanrd/accumulo-3652/commit/861494f8ec0a677d5fdf5fbe979399137f895dbc includes some changes to the class used in a static method call.

https://github.com/thormanrd/accumulo-3652/commit/6d632273f70ca59f9e671d2256dcae5682ee94fd seems to contain the majority of the rest.

A rebase won't help here. You would need to fix these commits to undo those changes.

THORMAN, ROBERT D wrote:
Sure, how do I trim them out?  They are the result of the 'git pull
--rebase¹ command.  When I tried to create the PR without some of them
earlier (PR¹s #30, #31) I got a compiler error from Jenkins.

v/r
Bob Thorman
Principal Big Data Engineer
AT&T Big Data CoE
2900 W. Plano Parkway
Plano, TX 75075
972-658-1714






On 4/23/15, 12:06 PM, "joshelser"<[email protected]>  wrote:

Github user joshelser commented on the pull request:

    https://github.com/apache/accumulo/pull/32#issuecomment-95655661

    Thanks for continuing to work on this, @thormanrd. There still seem
to be a bunch of unwanted changes in here.
core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOnDefaultTa
ble.java and
core/src/main/java/org/apache/accumulo/core/cli/MapReduceClientOnRequiredT
able.java changed the name of the class a static method was called on. I
also see a bunch of changes to the machine-generated thrift classes (e.g.
core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.
java). It seems like an IDE might have been a little overzealous?

    Can you try to trim out the changes which were made that aren't
related to slf4j, please?


---
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.
---

Reply via email to