Re: [openstack-dev] [congress] Jenkins failure

[Aaron Rosen]

You need to rebase again. The readme file changed before Jenkins got a
chance to test your patch.

On Monday, August 18, 2014, Rajdeep Dua  wrote:

> my branch already has the latest changes.
> it is not able to merge two rst files hence it failed
>
>
> On Tue, Aug 19, 2014 at 10:02 AM, Akash Gangil  > wrote:
>
>> "This change was unable to be automatically merged with the current state
>> of the repository. Please rebase your change and upload a new patchset."
>>
>> Rebase and commit?
>>
>>
>>  On Tue, Aug 19, 2014 at 12:10 AM, Rajdeep Dua > > wrote:
>>
>>>  One of my CL - updation of  README.rst seems to be failing jenkins
>>>
>>> https://review.openstack.org/#/c/114896/1
>>>
>>> Any idea how to get this passed?
>>>
>>> Thanks
>>> Rajdeep
>>>
>>> ___
>>> OpenStack-dev mailing list
>>> OpenStack-dev@lists.openstack.org
>>> 
>>> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>>>
>>>
>>
>>
>> --
>> Akash
>>
>> ___
>> OpenStack-dev mailing list
>> OpenStack-dev@lists.openstack.org
>> 
>> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>>
>>
>

-- 
Sent from Gmail Mobile
___
OpenStack-dev mailing list
OpenStack-dev@lists.openstack.org
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] [congress] Jenkins failure

[Tim Hinrichs]

Some docs got merged last night.  I think that if you fetch the latest and 
rebase that you’ll end up with conflicts that you need to resolve manually.  
The Readme file has changed a lot, so I’m sure git doesn’t know how to merge 
your changes in.

Tim

On Aug 18, 2014, at 10:21 PM, Rajdeep Dua 
mailto:rajdeep@gmail.com>> wrote:

my branch already has the latest changes.
it is not able to merge two rst files hence it failed


On Tue, Aug 19, 2014 at 10:02 AM, Akash Gangil 
mailto:akashg1...@gmail.com>> wrote:
"This change was unable to be automatically merged with the current state of 
the repository. Please rebase your change and upload a new patchset."

Rebase and commit?


On Tue, Aug 19, 2014 at 12:10 AM, Rajdeep Dua 
mailto:rajdeep@gmail.com>> wrote:
One of my CL - updation of  README.rst seems to be failing jenkins

https://review.openstack.org/#/c/114896/1

Any idea how to get this passed?

Thanks
Rajdeep

___
OpenStack-dev mailing list
OpenStack-dev@lists.openstack.org
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev




--
Akash

___
OpenStack-dev mailing list
OpenStack-dev@lists.openstack.org
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev


___
OpenStack-dev mailing list
OpenStack-dev@lists.openstack.org
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

___
OpenStack-dev mailing list
OpenStack-dev@lists.openstack.org
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] [congress] Jenkins failure

[Rajdeep Dua]

my branch already has the latest changes.
it is not able to merge two rst files hence it failed


On Tue, Aug 19, 2014 at 10:02 AM, Akash Gangil  wrote:

> "This change was unable to be automatically merged with the current state
> of the repository. Please rebase your change and upload a new patchset."
>
> Rebase and commit?
>
>
> On Tue, Aug 19, 2014 at 12:10 AM, Rajdeep Dua 
> wrote:
>
>> One of my CL - updation of  README.rst seems to be failing jenkins
>>
>> https://review.openstack.org/#/c/114896/1
>>
>> Any idea how to get this passed?
>>
>> Thanks
>> Rajdeep
>>
>> ___
>> OpenStack-dev mailing list
>> OpenStack-dev@lists.openstack.org
>> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>>
>>
>
>
> --
> Akash
>
> ___
> OpenStack-dev mailing list
> OpenStack-dev@lists.openstack.org
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>
>
___
OpenStack-dev mailing list
OpenStack-dev@lists.openstack.org
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Re: [openstack-dev] [congress] Jenkins failure

[Akash Gangil]

"This change was unable to be automatically merged with the current state
of the repository. Please rebase your change and upload a new patchset."

Rebase and commit?


On Tue, Aug 19, 2014 at 12:10 AM, Rajdeep Dua  wrote:

> One of my CL - updation of  README.rst seems to be failing jenkins
>
> https://review.openstack.org/#/c/114896/1
>
> Any idea how to get this passed?
>
> Thanks
> Rajdeep
>
> ___
> OpenStack-dev mailing list
> OpenStack-dev@lists.openstack.org
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>
>


-- 
Akash
___
OpenStack-dev mailing list
OpenStack-dev@lists.openstack.org
http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev