Possible resolution to issue JBTM-1614 #260

Closed
wants to merge 6 commits into
from

Projects

None yet

5 participants

@StuartWheater

Passes unit tests

@StuartWheater StuartWheater reopened this Apr 4, 2013
@tomjenkinson

Hi Stuart,

Would you be able to sign our CLA please: cla.jboss.org

Thanks!

@tomjenkinson

(its per project, if you have already signed it for something else)

@StuartWheater
@tomjenkinson

Hi Stuart,

I see you have signed the agreement now for "JBoss Transactions", this is the right one thanks. At the moment your application is "Awaiting company verification (Apr 3, 2013)" I think someone (not me) checks that Arjuna exists so it should just take a day or so for that to come through.

In terms of the ip address, it is actually only visible on the RH ncl intranet, I will send you the logs if it fails if that is OK?

Tom

@StuartWheater
@jbosstm-bot

Tests failed: XTS: SOME TESTS failed

@tomjenkinson

Hi Stuart,

The failure looks unrelated to your change, it is a new issue introduced between the AS and XTS but unfortunately your change didn't get tested yet so I can't merge it just yet.

Once the XTS issue is resolved I will re-run your build and merge it then. I am still trying to work out why your CLA wasn't processed yet. I will try to contact the jboss.org team in the meantime.

Tom

@StuartWheater
@tomjenkinson

Hi Stuart,

I just got this back from the jboss.org team:

"The state 'Awaiting company verification" means that an email has been sent to
the associated company email address so that someone can verify on behalf of
the company that the Corporate Agreement can be signed.

In the case of "Arjuna Technologies" the email address is info@arjuna.com so
whoever receives email there needs to click on a verification link in the
email. The system will then send a notification to me and I can give the final
approval."

Hope that is OK,
Tom

@StuartWheater
gytis and others added some commits Apr 10, 2013
@gytis gytis JBTM-1617. When testing pull requests do a rebase to the merge point 499ccd5
@tomjenkinson tomjenkinson Merge pull request #266 from Gytis/master-JBTM-1625
JBTM-1625. Retain the commit id of the app server being used for testing (master)
3c87b9b
@tomjenkinson tomjenkinson Merge pull request #264 from Gytis/master-JBTM-1617
JBTM-1617. When testing pull requests do a rebase to the merge point (master)
b9db83d
@tomjenkinson

Hi Stuart, I see you have been accepted via the CLA mechanism now.

Please may I ask you to rebase your branch on master as we have fixed the reason for the last failure of your pull request (an intermittent XTS issue) but unfortunately your pull had not reached the point where it would have been tested fully (i.e. the qa/ suite)

@jbosstm-bot

Narayana rebase failed. Please rebase it manually.

@jbosstm-bot

Tests failed: Narayana rebase failed

@tomjenkinson

The rebase onto master did not work too well I think due to the last merge commit of master onto StuartWheater/narayana@9866a55.

On the team, we normally would have rebased the branch using:
git pull --rebase --ff-only upstream/master
(you then have to force the push to your branch)

I have created a new pull request #269 with just your commit in it on the latest master (it is still your commit with your author details on it) so I can merge it into master cleanly.

Once #269 passes I will merge it - thanks again!

@StuartWheater
@tomjenkinson

Hi Stuart, We are using this approach (generally): https://community.jboss.org/wiki/HackingOnAS7

Tom

@paulrobinson

Can this be closed now that we have #269?

@tomjenkinson

Thanks for the pull request Stuart, I had left your request open in case you had more commits to push if QA did fail. It appears though that QA has passed so I will now merge #269.

Thanks for your contribution! We look forward to more :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment