Re: [opnfv-tech-discuss] [OPNFV Helpdesk #35878] [linuxfoundation.org #35878] [releng][opnfvdocs] Problem with Git/Gerrit/Jenkins

2017-01-27 Thread Ryota Mibu via RT
m: Kunzmann, Gerald via RT [mailto:opnfv-helpd...@rt.linuxfoundation.org] > Sent: Friday, January 27, 2017 5:14 PM > Cc: opnfv-tech-discuss@lists.opnfv.org; Mibu Ryota(壬生 亮太) > > Subject: RE: [opnfv-tech-discuss] [OPNFV Helpdesk #35878] > [linuxfoundation.org #35878] [releng][opn

Re: [opnfv-tech-discuss] [OPNFV Helpdesk #35878] [linuxfoundation.org #35878] [releng][opnfvdocs] Problem with Git/Gerrit/Jenkins

2017-01-27 Thread Ryota Mibu
m: Kunzmann, Gerald via RT [mailto:opnfv-helpd...@rt.linuxfoundation.org] > Sent: Friday, January 27, 2017 5:14 PM > Cc: opnfv-tech-discuss@lists.opnfv.org; Mibu Ryota(壬生 亮太) > > Subject: RE: [opnfv-tech-discuss] [OPNFV Helpdesk #35878] > [linuxfoundation.org #35878] [releng][opn

Re: [opnfv-tech-discuss] [OPNFV Helpdesk #35878] [linuxfoundation.org #35878] [releng][opnfvdocs] Problem with Git/Gerrit/Jenkins

2017-01-27 Thread Kunzmann, Gerald
rstag, 26. Januar 2017 20:54 To: Kunzmann, Gerald Cc: opnfv-tech-discuss@lists.opnfv.org; r-m...@cq.jp.nec.com Subject: Re: [opnfv-tech-discuss] [OPNFV Helpdesk #35878] [linuxfoundation.org #35878] [releng][opnfvdocs] Problem with Git/Gerrit/Jenkins Hi, Looks like the merge job is doing the wrong

Re: [opnfv-tech-discuss] [OPNFV Helpdesk #35878] [linuxfoundation.org #35878] [releng][opnfvdocs] Problem with Git/Gerrit/Jenkins

2017-01-27 Thread Kunzmann, Gerald via RT
rstag, 26. Januar 2017 20:54 To: Kunzmann, Gerald Cc: opnfv-tech-discuss@lists.opnfv.org; r-m...@cq.jp.nec.com Subject: Re: [opnfv-tech-discuss] [OPNFV Helpdesk #35878] [linuxfoundation.org #35878] [releng][opnfvdocs] Problem with Git/Gerrit/Jenkins Hi, Looks like the merge job is doing the wrong

Re: [opnfv-tech-discuss] [OPNFV Helpdesk #35878] [linuxfoundation.org #35878] [releng][opnfvdocs] Problem with Git/Gerrit/Jenkins

2017-01-26 Thread Aric Gardner via RT
Hi, Looks like the merge job is doing the wrong thing. its checking out the patchset, rather than what is in master. since the patchset is from Dec 28, and does not touch ./docs/requirements/05-implementation.rst (which has been updated since then) git does not see a conflict with merging this co

Re: [opnfv-tech-discuss] [OPNFV Helpdesk #35878] [linuxfoundation.org #35878] [releng][opnfvdocs] Problem with Git/Gerrit/Jenkins

2017-01-26 Thread Aric Gardner
Hi, Looks like the merge job is doing the wrong thing. its checking out the patchset, rather than what is in master. since the patchset is from Dec 28, and does not touch ./docs/requirements/05-implementation.rst (which has been updated since then) git does not see a conflict with merging this co