Skip to content
This repository was archived by the owner on Apr 25, 2024. It is now read-only.

Conversation

@emsouza
Copy link
Contributor

@emsouza emsouza commented Jun 11, 2015

No description provided.

@asfbot
Copy link

asfbot commented Jun 11, 2015

archiva-master-build-pr-builder #17 UNSTABLE
Looks like there's a problem with this pull request

@asfbot
Copy link

asfbot commented Jun 15, 2015

archiva-master-build-pr-builder #18 SUCCESS
This pull request looks good

@ebarboni
Copy link
Contributor

The PR was good, error was because of failling test on other modules.
I don't know how to merge :(

@olamy
Copy link
Member

olamy commented Jun 16, 2015

@ebarboni
vi .git/config
add those lines
[remote "github"]
url = https://github.com/apache/archiva.git
fetch = +refs/heads/:refs/remotes/github/
fetch = +refs/pull//head:refs/pull/upstream/

git fetch github
git checkout pr/16
test it
then git checkout master
git merge pr/16
then git push origin master
if origin is the apache git

@ebarboni
Copy link
Contributor

@olamy, thanks a lot, (I was looking for some button or UI on the github web site for merging)

@olamy
Copy link
Member

olamy commented Jun 17, 2015

@ebarboni Nope as github is not the primary git repo.

@asfgit asfgit merged commit 01f9aad into apache:master Jun 17, 2015
@hugosenari
Copy link

Only for the record.
I tested this version (master), and don't solves my problem.
I don't know if is another problem with proxy or is same that still unsolved.

With old version my logs looks similar to bug description (timeout) now is different (auth error)
If help, here is my log.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants