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 <[email protected]> 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 <[email protected] > <javascript:_e(%7B%7D,'cvml','[email protected]');>> 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 <[email protected] >> <javascript:_e(%7B%7D,'cvml','[email protected]');>> 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 >>> [email protected] >>> <javascript:_e(%7B%7D,'cvml','[email protected]');> >>> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev >>> >>> >> >> >> -- >> Akash >> >> _______________________________________________ >> OpenStack-dev mailing list >> [email protected] >> <javascript:_e(%7B%7D,'cvml','[email protected]');> >> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev >> >> > -- Sent from Gmail Mobile
_______________________________________________ OpenStack-dev mailing list [email protected] http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
