*** derekh has joined #openstack-stable | 00:47 | |
*** rcernin has quit IRC | 00:54 | |
*** Qiming_ has joined #openstack-stable | 01:02 | |
*** derekh has quit IRC | 01:09 | |
*** mriedem has quit IRC | 01:15 | |
*** pcaruana has joined #openstack-stable | 04:25 | |
*** pcaruana has quit IRC | 04:32 | |
*** armax has quit IRC | 05:13 | |
*** rcernin has joined #openstack-stable | 05:54 | |
*** pcaruana has joined #openstack-stable | 06:12 | |
*** crinkle_ has joined #openstack-stable | 06:59 | |
*** crinkle has quit IRC | 07:00 | |
*** crinkle_ is now known as crinkle | 07:00 | |
*** tesseract has joined #openstack-stable | 07:05 | |
*** tesseract has quit IRC | 07:09 | |
*** e0ne has joined #openstack-stable | 07:23 | |
*** e0ne has quit IRC | 07:26 | |
*** jamielennox is now known as jamielennox|away | 08:10 | |
*** dtantsur|afk is now known as dtantsur | 08:17 | |
*** apevec has joined #openstack-stable | 08:32 | |
*** apevec has quit IRC | 08:32 | |
*** apevec has joined #openstack-stable | 08:32 | |
kashyap | apevec: Here? | 08:38 |
---|---|---|
kashyap | apevec: When you are, can I turn this into a cherry-pick without messing up? https://review.openstack.org/#/c/314012/4 | 08:39 |
*** e0ne has joined #openstack-stable | 08:39 | |
kashyap | apevec: Or should I just update the Change-ID as Mitaka/Newton | 08:40 |
*** pcaruana is now known as pcaruana|afk| | 09:01 | |
kashyap | apevec: Ignore me, I'm doing a proper cherry-pick and resolving the conflicts | 09:05 |
apevec | kashyap, you need to abandon the one w/ bad changeid | 09:06 |
apevec | that's part of Gerrit "primary-key" | 09:06 |
kashyap | apevec: Yes, will abandon that, | 09:06 |
apevec | (changeid, branch) is the PK afaict | 09:06 |
apevec | actually alternate key to be preciese :) | 09:07 |
kashyap | Noted. apevec Is there a way I can supply change ID when doing cherry-pick? | 09:07 |
apevec | PK is generated sequence id of course :) | 09:07 |
apevec | kashyap, it is part of commit msg, so just don't touch it | 09:08 |
apevec | important is it must stay in the last paragraph | 09:08 |
apevec | otherwise git-review will generate new one | 09:08 |
kashyap | apevec: The thing is...I did something silly: I already have a new change, with the proper change ID - https://review.openstack.org/#/c/315423/ | 09:08 |
kashyap | apevec: But it is not 'cherry-pick'ed -- I merely edited the old commit, and updated the change ID to reflect the correct one. | 09:09 |
apevec | ok, that one looks good https://review.openstack.org/#/q/Ibea4954c149b9dcb162c5962ab8e9a4f17e51a1d,n,z | 09:09 |
apevec | ah you need git cherry-pick -x | 09:09 |
apevec | or just edit commit message and add that line | 09:09 |
apevec | process is documented in http://docs.openstack.org/project-team-guide/stable-branches.html#proposing-fixes | 09:11 |
kashyap | apevec: Add the (cherry picked from commit 82098d06dbaf401966a70c873b8aa97e7eab4b10) | 09:11 |
kashyap | ? | 09:11 |
kashyap | Wouldn't that be 'cheating'? | 09:12 |
kashyap | Yes, yes, /me goes to RTFM | 09:12 |
apevec | why? It's just not automated, git c-p -x does it for you :) | 09:12 |
kashyap | apevec: Okay, let me do that | 09:12 |
apevec | btw it should be two | 09:12 |
apevec | b/c you're supposed to cherry pick from the branch+1 | 09:13 |
kashyap | apevec: But, when I do `git c-p -x`, how do I tell it to not generate a new Change-ID and use Ibea4954c149b9dcb162c5962ab8e9a4f17e51a1d | 09:13 |
apevec | so if you cherry-pick -x mitaka backport which already has (cherry picked from ....) it adds one more | 09:14 |
kashyap | (Yes, will make it a cherry-pic from stable/mitaka) | 09:14 |
kashyap | Yes, that I get it. I'm just trying to ensure that if I can turn this new change into a cherry-picked one -- https://review.openstack.org/#/c/315423/ | 09:14 |
kashyap | Ignore me if I'm annoying you :-) | 09:15 |
apevec | kashyap, see Warning box in http://docs.openstack.org/project-team-guide/stable-branches.html#change-ids | 09:15 |
* kashyap clicks | 09:15 | |
kashyap | apevec: Yep, aware fo that 'Warning' and I did follow it previously for other backports. | 09:16 |
*** Qiming_ has quit IRC | 10:06 | |
*** ttx has quit IRC | 11:56 | |
*** ttx has joined #openstack-stable | 12:07 | |
*** amrith is now known as _amrith_ | 12:46 | |
kashyap | tonyb: I was reworking the patch locally, and was about to send -- but stepped out to pick up my bicycle | 12:51 |
kashyap | tonyb: Thanks however for fixing that. Why still a -1? | 12:51 |
kashyap | apevec: It is fixed now -- does it look better? | 12:56 |
*** pcaruana|afk| is now known as pcaruana | 13:01 | |
*** mriedem has joined #openstack-stable | 13:04 | |
*** coreycb has quit IRC | 13:04 | |
*** coreycb has joined #openstack-stable | 13:04 | |
*** sigmavirus24_awa is now known as sigmavirus24 | 13:28 | |
*** dtantsur is now known as dtantsur|bbl | 13:42 | |
*** eharney has joined #openstack-stable | 13:47 | |
apevec | kashyap, it does, +2 from me | 13:47 |
kashyap | Thanks. Sorry for the nuisance. | 13:48 |
*** _amrith_ is now known as amrith | 14:09 | |
*** doug-fish has joined #openstack-stable | 14:11 | |
kashyap | mriedem: Thanks! | 14:17 |
*** flaper87 has quit IRC | 14:24 | |
*** flaper87 has joined #openstack-stable | 14:27 | |
*** flaper87 has quit IRC | 14:27 | |
*** flaper87 has joined #openstack-stable | 14:27 | |
*** catintheroof has joined #openstack-stable | 15:26 | |
*** catintheroof has quit IRC | 15:27 | |
*** catintheroof has joined #openstack-stable | 15:29 | |
*** armax has joined #openstack-stable | 15:34 | |
*** e0ne has quit IRC | 15:36 | |
*** xhku has joined #openstack-stable | 15:50 | |
*** doug-fis_ has joined #openstack-stable | 16:01 | |
*** doug-fi__ has joined #openstack-stable | 16:03 | |
*** doug-fish has quit IRC | 16:05 | |
*** doug-fis_ has quit IRC | 16:06 | |
*** doug-fi__ has quit IRC | 16:08 | |
*** doug-fish has joined #openstack-stable | 16:43 | |
*** doug-fish has quit IRC | 16:48 | |
*** e0ne has joined #openstack-stable | 17:03 | |
*** AJaeger has joined #openstack-stable | 17:04 | |
AJaeger | stable cores, could you import translations for horizon, please? https://review.openstack.org/310104 and https://review.openstack.org/309740 they have already one +2 by david-lyle | 17:08 |
AJaeger | tonyb, mriedem are you around to help, please? ^ | 17:09 |
mriedem | AJaeger: in a meeting, can look after | 17:11 |
AJaeger | thanks, mriedem - found another horizon stable core meanwhile! | 17:12 |
AJaeger | so, no further action needed... | 17:12 |
*** doug-fish has joined #openstack-stable | 17:22 | |
*** doug-fish has quit IRC | 17:23 | |
*** doug-fish has joined #openstack-stable | 17:24 | |
*** dtantsur|bbl is now known as dtantsur | 17:24 | |
*** e0ne has quit IRC | 17:24 | |
*** doug-fish has quit IRC | 17:28 | |
*** AJaeger has left #openstack-stable | 17:41 | |
*** e0ne has joined #openstack-stable | 17:44 | |
*** doug-fis_ has joined #openstack-stable | 17:48 | |
*** amrith has quit IRC | 17:53 | |
*** doug-fis_ has quit IRC | 17:54 | |
*** pcaruana has quit IRC | 17:58 | |
*** mriedem has quit IRC | 18:03 | |
*** mriedem has joined #openstack-stable | 18:03 | |
*** doug-fish has joined #openstack-stable | 18:05 | |
*** dtantsur is now known as dtantsur|afk | 18:07 | |
*** doug-fis_ has joined #openstack-stable | 18:08 | |
*** _amrith_ has joined #openstack-stable | 18:08 | |
*** _amrith_ is now known as amrith | 18:08 | |
*** rcernin has quit IRC | 18:09 | |
*** doug-fish has quit IRC | 18:10 | |
*** doug-fis_ has quit IRC | 18:13 | |
*** e0ne has quit IRC | 18:41 | |
*** armax has quit IRC | 19:07 | |
*** AJaeger has joined #openstack-stable | 19:18 | |
*** AJaeger has left #openstack-stable | 19:19 | |
*** bswartz has quit IRC | 19:39 | |
fungi | dhellmann: Daviey: AJaeger's stable/kilo eol request to the -infra ml for the openstack/openstack-manuals repo just reminded me, if the stable branch managers are wanting to take over the eol process, how do you want eol requests from the big tent funneled to you? http://lists.openstack.org/pipermail/openstack-infra/2016-May/004282.html | 19:51 |
* fungi feels like it would be a silly outcome if the stable team took over eol for just a subset of projects and expected all the others to continue requesting it from the infra team | 19:52 | |
fungi | odyssey4me: ^ you had expressed opinions on revamping the process as well | 19:53 |
*** pabelanger has joined #openstack-stable | 19:53 | |
pabelanger | ohai! | 19:53 |
*** amrith is now known as _amrith_ | 20:12 | |
*** rcernin has joined #openstack-stable | 20:24 | |
dhellmann | fungi: good point. I'll let tonyb and Daviey propose something since I haven't given the process much thought yet | 20:26 |
tonyb | dhellmann: neither have I. I'll ponder on it today | 20:27 |
*** eharney has quit IRC | 20:42 | |
*** armax has joined #openstack-stable | 20:50 | |
*** dtantsur|afk has quit IRC | 21:33 | |
*** dtantsur has joined #openstack-stable | 21:35 | |
*** doug-fish has joined #openstack-stable | 21:43 | |
*** bswartz has joined #openstack-stable | 21:47 | |
*** doug-fish has quit IRC | 21:48 | |
*** sigmavirus24 is now known as sigmavirus24_awa | 22:00 | |
*** jamielennox|away is now known as jamielennox | 22:24 | |
*** mriedem has quit IRC | 22:34 | |
*** mriedem has joined #openstack-stable | 22:34 | |
*** mriedem has quit IRC | 22:35 | |
*** Qiming_ has joined #openstack-stable | 22:39 | |
*** apevec has quit IRC | 22:50 | |
*** mriedem has joined #openstack-stable | 23:46 |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!