*** mszilagyi has quit IRC | 00:04 | |
*** ohnoimdead has quit IRC | 00:15 | |
*** jakedahn has quit IRC | 00:18 | |
*** martine has quit IRC | 00:21 | |
*** jdurgin has quit IRC | 00:40 | |
*** deshantm has joined #openstack-dev | 00:44 | |
*** novas0x2a|laptop has quit IRC | 01:02 | |
*** lorin1 has joined #openstack-dev | 01:10 | |
*** kbringard has joined #openstack-dev | 01:13 | |
*** mwhooker has quit IRC | 01:16 | |
*** lorin1 has quit IRC | 01:22 | |
*** hugokuo has joined #openstack-dev | 01:24 | |
*** lorin1 has joined #openstack-dev | 01:26 | |
openstackgerrit | Yogeshwar Srikrishnan proposed a change to openstack/keystone: Validation content and relavant changes. https://review.openstack.org/383 | 01:37 |
---|---|---|
*** lorin1 has quit IRC | 01:40 | |
*** foxtrotgulf has quit IRC | 01:44 | |
*** jakedahn has joined #openstack-dev | 01:47 | |
*** vladimir3p has quit IRC | 01:49 | |
*** stanchan has quit IRC | 01:53 | |
*** deshantm has quit IRC | 01:56 | |
*** med_out has quit IRC | 01:56 | |
*** relateable has quit IRC | 01:56 | |
*** deshantm has joined #openstack-dev | 01:58 | |
*** med_out has joined #openstack-dev | 01:58 | |
*** relateable has joined #openstack-dev | 01:58 | |
*** tsuzuki_ has joined #openstack-dev | 02:00 | |
*** mgius has quit IRC | 02:04 | |
*** kbringard has quit IRC | 02:07 | |
*** mattray has quit IRC | 02:10 | |
*** martine has joined #openstack-dev | 02:12 | |
*** rods has quit IRC | 02:23 | |
*** rohitkarajgi has joined #openstack-dev | 02:33 | |
*** rnorwood has joined #openstack-dev | 02:37 | |
*** rohitkarajgi has quit IRC | 02:43 | |
*** chomping has quit IRC | 02:55 | |
*** rohitkarajgi has joined #openstack-dev | 03:19 | |
*** toluene has joined #openstack-dev | 03:34 | |
*** asalkeld has joined #openstack-dev | 03:39 | |
notmyname | jeblair: mtaylor: I get "Application Error, Server Error, Internal Server Error" when I try to add a watch for swift in gerrit. what's up? | 03:42 |
mtaylor | notmyname: looking | 03:42 |
mtaylor | notmyname: you don't already have one? | 03:43 |
*** novas0x2a|laptop has joined #openstack-dev | 03:43 | |
mtaylor | (you should have a watch already added for you for swift, so if you don't that's an issue) | 03:43 |
notmyname | let's go with "perhaps?" | 03:43 |
notmyname | ah, the second section on the page there is the current watches? | 03:43 |
notmyname | mtaylor: so I don't really care about glance/keystone/etc merges. what do I click on to filter it? | 03:44 |
mtaylor | yes | 03:44 |
mtaylor | just click on the check box next to each of them and click "delete" | 03:45 |
notmyname | no, I just have one watch set up | 03:45 |
notmyname | I want whatever the new version of https://code.launchpad.net/swift/+activereviews is | 03:45 |
mtaylor | ah - you're looking for "Watched Changes" under the "My" menu at top ... which winds up being https://review.openstack.org/#q,is:watched+status:open,n,z | 03:46 |
notmyname | ah ok | 03:46 |
notmyname | last question (for now ;-) ). what are the V and R columns? | 03:46 |
mtaylor | Verified and Reviewed | 03:46 |
mtaylor | verified is jenkins status, reviewed is code review status | 03:47 |
notmyname | ah ok. thanks for your help :-) | 03:48 |
mtaylor | sure thing! | 03:48 |
mtaylor | (also, if you explicitly want to see swift reviews and not just things you are watching, there is https://review.openstack.org/#q,status:open+project:openstack/swift,n,z) | 03:48 |
notmyname | thanks | 03:49 |
mtaylor | I kinda wish thathttps://review.openstack.org/#mine was a little different ... I may make a patch or two at some point | 03:49 |
*** novas0x2a|laptop has quit IRC | 04:45 | |
*** jdag has left #openstack-dev | 04:55 | |
openstackgerrit | A change was merged to openstack/keystone: Validation content and relavant changes. https://review.openstack.org/383 | 05:09 |
*** martine has quit IRC | 05:14 | |
*** ewindisch has quit IRC | 05:23 | |
*** zaitcev has quit IRC | 05:25 | |
*** rohitkarajgi has quit IRC | 05:28 | |
*** KiwiMartin has joined #openstack-dev | 05:56 | |
*** negronjl has quit IRC | 05:56 | |
*** KiwiMartin has left #openstack-dev | 05:56 | |
*** negronjl has joined #openstack-dev | 06:01 | |
*** rohitkarajgi has joined #openstack-dev | 06:11 | |
toluene | hi guys! I'm currently registered a branch for glance and sent a request for merging to the trunk, a buddy named klmitch told me the merging process is now done through the Gerrit. Would somebody helps me how to go through this stuff ? https://code.launchpad.net/~benzwt/glance/adaptive_index_listing/+merge/74067 | 06:15 |
*** novas0x2a|laptop has joined #openstack-dev | 06:16 | |
*** reidrac has joined #openstack-dev | 07:07 | |
hugokuo | reidrac , should I add an account for tempauth at beginning ? | 07:30 |
*** novas0x2a|laptop has quit IRC | 07:41 | |
*** ewindisch_ has joined #openstack-dev | 07:52 | |
vishy | toulene: http://wiki.openstack.org/GerritWorkflow | 08:04 |
toluene | vishy, I gone through that article, but as a beginner, I still got no idea how to do | 08:18 |
*** mnour has joined #openstack-dev | 08:25 | |
*** Daviey has quit IRC | 08:30 | |
*** ewindisch_ has quit IRC | 08:30 | |
*** jeremyb has quit IRC | 08:30 | |
*** blamar has quit IRC | 08:31 | |
*** antonym has quit IRC | 08:31 | |
*** antonym has joined #openstack-dev | 08:31 | |
*** jeremyb has joined #openstack-dev | 08:31 | |
*** antonym is now known as Guest93228 | 08:32 | |
*** blamar has joined #openstack-dev | 08:34 | |
*** Daviey has joined #openstack-dev | 08:34 | |
*** ewindisch_ has joined #openstack-dev | 08:42 | |
*** darraghb has joined #openstack-dev | 08:47 | |
*** rohitkarajgi has quit IRC | 09:06 | |
ttx | vishy: could you flip the approved switch on https://code.launchpad.net/~danwent/nova/qmanager-new/+merge/72526 ? | 09:09 |
ttx | Looks like it's all clear. | 09:09 |
ttx | or soren ^ | 09:10 |
*** rohitkarajgi has joined #openstack-dev | 09:15 | |
ttx | vishy: also we need to make a call on https://code.launchpad.net/~ed-leafe/nova/scheduler-multifilter/+merge/72478 | 09:15 |
ttx | vishy: finally we also still need assignees for bug 834189 and bug 827807 -- any idea who you could prod for that ? | 09:21 |
uvirtbot | Launchpad bug 834189 in nova "XenServer and KVM handle local storage differently" [Critical,Triaged] https://launchpad.net/bugs/834189 | 09:21 |
uvirtbot | Launchpad bug 827807 in nova "in multi_host nova-network mode, nova-network doesn't reassociate reassociate the floating ips on reboot" [Medium,Triaged] https://launchpad.net/bugs/827807 | 09:21 |
vishy | the second should be easy | 09:23 |
vishy | i can do it | 09:23 |
vishy | the first one i don't know who can take it | 09:23 |
vishy | i don't really have enough time to tackle it, but I don't know of anyone else | 09:23 |
vishy | maybe soren could do it if he has time | 09:23 |
*** tryggvil_ has joined #openstack-dev | 09:29 | |
ttx | vishy: OK, I'll assign you to the second one | 09:32 |
*** tsuzuki_ has quit IRC | 09:33 | |
ttx | vishy: thoughts on whether we should push https://code.launchpad.net/~ed-leafe/nova/scheduler-multifilter/+merge/72478 in diablo ? | 09:33 |
*** hugokuo has quit IRC | 10:18 | |
*** Binbin has quit IRC | 10:49 | |
*** Binbin has joined #openstack-dev | 11:02 | |
*** toluene has quit IRC | 11:02 | |
*** lorin1 has joined #openstack-dev | 11:32 | |
*** lorin1 has quit IRC | 11:34 | |
*** lorin1 has joined #openstack-dev | 11:34 | |
*** markvoelker has joined #openstack-dev | 11:45 | |
*** rohitkarajgi has quit IRC | 12:19 | |
*** carl_tw has joined #openstack-dev | 12:23 | |
*** lts has joined #openstack-dev | 12:35 | |
*** martine has joined #openstack-dev | 12:46 | |
*** markmc has joined #openstack-dev | 12:47 | |
*** rnorwood has quit IRC | 12:49 | |
*** mfer has joined #openstack-dev | 12:55 | |
*** jaypipes has joined #openstack-dev | 13:04 | |
*** Binbin has quit IRC | 13:14 | |
*** bourke has joined #openstack-dev | 13:21 | |
*** kbringard has joined #openstack-dev | 13:24 | |
*** amccabe has joined #openstack-dev | 13:33 | |
*** lts has quit IRC | 13:34 | |
*** BK_man has joined #openstack-dev | 13:36 | |
soren | sandywalsh: Since you weighed in on the "incident system", can you explain what that is? | 13:38 |
soren | sandywalsh: "incident system" has no meaning to me. | 13:38 |
sandywalsh | soren, my understanding of an "incident system" is a way to monitor for problems in nova (tricky since they could occur in any service) and logs suck. I could be wrong. | 13:48 |
soren | Then what "Our first features all involve outside tools creating incidents" mean? | 13:49 |
soren | So he wants to add a feature whose purpose is to create problems? | 13:49 |
sandywalsh | yeah, could be something different. | 13:50 |
sandywalsh | doesn't make much sense in that context. | 13:50 |
sandywalsh | guess we'll see when he responds | 13:50 |
sandywalsh | that statement conflicts with " to define a standard incident API so that core openstack components could send incidents directly." | 13:51 |
soren | Is he talking about a ticket system of some sort, perhaps? | 13:52 |
sandywalsh | yeah, sounds like a means to interface with a ticketing system | 13:53 |
kbringard | hmmm, I'm running 1528… has anyone else noticed that when you euca-describe-instances it appears to show all instances that have been run (again)? | 13:53 |
kbringard | some of which are still shown in the state running, even though they don't exist | 13:53 |
kbringard | also: it doesn't seem to enforce project boundaries, by which I mean, I run describe as a regular user in one project, and it shows everything, regardless of project | 13:54 |
*** bcwaldon has joined #openstack-dev | 13:54 | |
kbringard | so I guess I'm asking if this is something new that I should investigate and file a bug, or is this a known thing? | 13:54 |
soren | Are you using keystone? | 13:55 |
kbringard | nope | 13:55 |
kbringard | should I be? | 13:55 |
*** joesavak has joined #openstack-dev | 13:55 | |
soren | kbringard: Depends. Did you tell Nova to use old-school auth? | 13:56 |
kbringard | not explicitly… did it change to use keystone by default? | 13:56 |
soren | Yeah. | 13:56 |
kbringard | ah so | 13:56 |
kbringard | that would likely explain it then | 13:57 |
soren | So if you're accessing Nova directly, it grants to access to everything. | 13:57 |
soren | I think. | 13:57 |
kbringard | do you know off the top of your head the flag to make it use the oldschool auth? | 13:57 |
soren | trying to find it. | 13:57 |
kbringard | until I can get keystone setup and working | 13:57 |
*** jsavak has joined #openstack-dev | 13:57 | |
soren | --use_deprecated_auth=1 | 13:57 |
kbringard | haha, deprecated, I always love putting in flags like that ;-) | 13:58 |
soren | It's better than Apache's -DGAPING_SECURITY_HOLE :) | 13:58 |
kbringard | lol, indeed | 13:58 |
*** lts has joined #openstack-dev | 13:58 | |
kbringard | do I need to do anything other than bounce nova-api once I've added that flag? | 14:00 |
*** rnorwood has joined #openstack-dev | 14:00 | |
soren | kbringard: No. | 14:00 |
kbringard | hmmm, OK, then it's still doing it | 14:00 |
* kbringard investigates further | 14:01 | |
*** joesavak has quit IRC | 14:01 | |
soren | Hm. | 14:02 |
soren | Ok. | 14:02 |
kbringard | it's interesting too, that it shows the ones that are terminated | 14:05 |
kbringard | and also, it shows some as running, but they're not | 14:05 |
kbringard | INSTANCEi-00000043ami-00000004running kb718q (kevin-test, enc2b11) 2 m1.small 2011-08-31T16:18:28Z plano-trunk0 aki-00000003 ami-00000000 | 14:05 |
kbringard | euca-terminate-instances i-00000043 | 14:06 |
kbringard | InstanceNotFound: Instance i-00000043 could not be found. | 14:06 |
kbringard | but, if I try to describe the instance specifically, it doesn't show it, only when you don't specify an instance id in describe | 14:06 |
kbringard | that smacks of a bug to me | 14:07 |
* kbringard starts spelunking the ec2 api code | 14:08 | |
*** rnorwood has quit IRC | 14:21 | |
*** rnorwood has joined #openstack-dev | 14:24 | |
*** cp16net has joined #openstack-dev | 14:24 | |
*** code_franco has joined #openstack-dev | 14:33 | |
*** vladimir3p has joined #openstack-dev | 14:37 | |
openstackjenkins | Project nova build #1,330: SUCCESS in 3 min 53 sec: https://jenkins.openstack.org/job/nova/1330/ | 14:40 |
openstackjenkins | Tarmac: An AMI image without ramdisk image should start. | 14:40 |
openstackjenkins | It's possible with EC2 API but it fails with OS API. | 14:40 |
openstackjenkins | This patch corrects that by returns 'None' value if AMI image doesn't contain 'ramdisk_id' metadata. | 14:40 |
*** lorin1 has left #openstack-dev | 14:42 | |
*** lorin1 has joined #openstack-dev | 14:42 | |
*** mattray has joined #openstack-dev | 14:42 | |
*** rnirmal has joined #openstack-dev | 14:44 | |
*** jakedahn has quit IRC | 14:55 | |
*** tryggvil_ has quit IRC | 14:56 | |
*** Guest93228 has quit IRC | 14:59 | |
*** Guest93228 has joined #openstack-dev | 14:59 | |
*** Guest93228 is now known as antonym | 14:59 | |
*** tryggvil has joined #openstack-dev | 15:00 | |
*** reidrac has quit IRC | 15:07 | |
*** dragondm has joined #openstack-dev | 15:11 | |
ttx | jaypipes: making progress on the last features for Glance ? | 15:12 |
*** mfer has quit IRC | 15:13 | |
jaypipes | ttx: as soon as I get done with my scrum call, yes :) | 15:17 |
ttx | jaypipes: kewl | 15:18 |
jaypipes | bcwaldon: please give this some love this morning: https://review.openstack.org/#change,350. And ping dprince about it if he's in the offfice ;) | 15:19 |
bcwaldon | jaypipes: will do | 15:19 |
jaypipes | bcwaldon: cheers | 15:20 |
*** mfer has joined #openstack-dev | 15:24 | |
bcwaldon | jaypipes: we need to get the nova changes for the xen driver done first, btw | 15:42 |
jaypipes | bcwaldon: for the glance pluggable auth? | 15:42 |
bcwaldon | the glance client keystone branch breaks nova/xen | 15:43 |
bcwaldon | since it isnt using the client | 15:43 |
*** jakedahn has joined #openstack-dev | 15:46 | |
jaypipes | bcwaldon: ah, I see. | 15:46 |
jaypipes | bcwaldon: what is the ETA on that? | 15:46 |
bcwaldon | we haven't had a chance to start, not sure if anybody on ozone has anything | 15:47 |
bcwaldon | jaypipes: dprince was going to look at it, afaik | 15:47 |
jaypipes | bcwaldon: hmm. OK, that makes those blueprints pretty much delayed until Essex then :( | 15:49 |
bcwaldon | yeah, unfortunately it's an essential integration point that was ignored | 15:49 |
jaypipes | bcwaldon: poopy mcturds. | 15:49 |
bcwaldon | watch your language, jaypipes | 15:50 |
jaypipes | bcwaldon: that's enough out of you! | 15:50 |
bcwaldon | aw | 15:50 |
*** bourke has quit IRC | 15:50 | |
*** novas0x2a|laptop has joined #openstack-dev | 15:58 | |
*** rnirmal has quit IRC | 16:02 | |
*** code_franco has quit IRC | 16:03 | |
*** cp16net_ has joined #openstack-dev | 16:03 | |
*** cp16net has quit IRC | 16:04 | |
*** cp16net_ is now known as cp16net | 16:04 | |
bcwaldon | vishy: image service cleanup branch passed smokestack | 16:06 |
bcwaldon | vishy: https://code.launchpad.net/~rackspace-titan/nova/image-service-cleanup/+merge/73621 | 16:06 |
bcwaldon | s1rp: if you've got time, I would appreciate a re-review on that branch as well | 16:07 |
s1rp | bcwaldon: sure | 16:08 |
bcwaldon | s1rp: thanks | 16:08 |
zul | mtaylor: ping | 16:09 |
*** bourke has joined #openstack-dev | 16:10 | |
*** mfer is now known as mfer-lunch | 16:11 | |
*** bourke has joined #openstack-dev | 16:12 | |
*** novas0x2a|laptop has quit IRC | 16:13 | |
*** bourke has joined #openstack-dev | 16:15 | |
*** mnour has quit IRC | 16:19 | |
zul | mtaylor: ping the keystone tarballs copy is failing fyi | 16:22 |
*** cp16net has quit IRC | 16:24 | |
*** cp16net has joined #openstack-dev | 16:25 | |
tr3buchet | ugh.. pep8 errors in trunk | 16:28 |
*** zaitcev has joined #openstack-dev | 16:30 | |
openstackgerrit | Yogeshwar Srikrishnan proposed a change to openstack/keystone: Adding new doc.Changes to sample xmls and jsons. https://review.openstack.org/384 | 16:34 |
*** jdag has joined #openstack-dev | 16:41 | |
*** jdag has left #openstack-dev | 16:42 | |
mtaylor | zul: thanks. | 16:42 |
mtaylor | tr3buchet: trunk of? | 16:42 |
zul | mtaylor: np | 16:42 |
tr3buchet | mtaylor: nova | 16:42 |
mtaylor | tr3buchet: k. as soon as nova is transitioned over, we should have that gatekeeping working much better | 16:43 |
tr3buchet | oh good | 16:43 |
tr3buchet | glad to hear that | 16:43 |
*** jdurgin has joined #openstack-dev | 16:43 | |
*** ttx has quit IRC | 16:56 | |
*** code_franco has joined #openstack-dev | 16:59 | |
*** jsavak has quit IRC | 17:00 | |
*** ttx has joined #openstack-dev | 17:02 | |
*** ttx has quit IRC | 17:02 | |
*** ttx has joined #openstack-dev | 17:02 | |
*** novas0x2a|laptop has joined #openstack-dev | 17:02 | |
*** mgius has joined #openstack-dev | 17:12 | |
*** ohnoimdead has joined #openstack-dev | 17:14 | |
*** lorin1 has left #openstack-dev | 17:23 | |
*** lorin1 has joined #openstack-dev | 17:23 | |
jk0 | vishy: is this something that can go in? https://code.launchpad.net/~jk0/nova/lp835090/+merge/74469 | 17:25 |
*** jeremyb has quit IRC | 17:29 | |
*** jeremyb has joined #openstack-dev | 17:29 | |
*** dragondm has quit IRC | 17:33 | |
*** darraghb has quit IRC | 17:41 | |
*** mfer-lunch is now known as mfer | 17:42 | |
openstackjenkins | Project nova build #1,331: SUCCESS in 3 min 58 sec: https://jenkins.openstack.org/job/nova/1331/ | 17:55 |
openstackjenkins | Tarmac: Set flat_injected to False by default. | 17:55 |
*** mszilagyi has joined #openstack-dev | 18:01 | |
*** code_franco has quit IRC | 18:05 | |
*** code_franco has joined #openstack-dev | 18:08 | |
blamar | devcamcar: ping on https://code.launchpad.net/~rackspace-titan/nova/empty-network-lp835242/+merge/73716 if you get a second | 18:16 |
*** banka has joined #openstack-dev | 18:33 | |
devcamcar | blamar: pong | 18:34 |
devcamcar | blamar: looking at 73716 now | 18:34 |
*** bcwaldon_ has joined #openstack-dev | 18:38 | |
*** bcwaldon has quit IRC | 18:39 | |
*** stanchan has joined #openstack-dev | 18:41 | |
devcamcar | blamar: its merged <3 | 18:41 |
blamar | devcamcar: wee, much appreciated! | 18:41 |
blamar | tyty | 18:41 |
*** banka has quit IRC | 18:45 | |
*** jdag has joined #openstack-dev | 18:56 | |
*** dragondm has joined #openstack-dev | 19:00 | |
openstackjenkins | Project nova build #1,332: SUCCESS in 4 min 10 sec: https://jenkins.openstack.org/job/nova/1332/ | 19:00 |
openstackjenkins | Tarmac: Fixes a case where if a VIF is returned with a NULL network it might not be able to be deleted. Added test case for that fix. | 19:00 |
*** Tushar has joined #openstack-dev | 19:12 | |
Tushar | tr3buchet: Are you there? | 19:13 |
Tushar | Can someone please review my MP here at #link https://code.launchpad.net/~ntt-pf-lab/nova/single-default-gateway/+merge/74159 ? | 19:16 |
*** dprince has joined #openstack-dev | 19:18 | |
tr3buchet | Tushar: on it | 19:19 |
*** ohnoimdead has quit IRC | 19:21 | |
Tushar | tr3buchet: Thanks | 19:21 |
*** code_franco has quit IRC | 19:28 | |
*** ohnoimdead has joined #openstack-dev | 19:30 | |
*** code_franco has joined #openstack-dev | 19:30 | |
*** ohnoimdead has quit IRC | 19:35 | |
*** lorin1 has quit IRC | 19:36 | |
openstackgerrit | A change was merged to openstack/keystone: Adding new doc.Changes to sample xmls and jsons. https://review.openstack.org/384 | 19:40 |
*** rohitkarajgi has joined #openstack-dev | 19:42 | |
*** kaptan has quit IRC | 19:46 | |
rohitkarajgi | Keeping a watch on nova-coverage on jenkins, a lot of unit tests have failed or throw error in the trunk | 19:47 |
rohitkarajgi | no coverage reports for last 5 runs | 19:47 |
*** termie has quit IRC | 19:50 | |
*** termie has joined #openstack-dev | 19:50 | |
*** termie has joined #openstack-dev | 19:50 | |
*** markvoelker has quit IRC | 19:50 | |
*** mwhooker has joined #openstack-dev | 20:00 | |
openstackgerrit | James E. Blair proposed a change to openstack/openstack-ci: Add bare-metal helper scripts. https://review.openstack.org/385 | 20:01 |
*** pvo has joined #openstack-dev | 20:05 | |
*** mattray has quit IRC | 20:06 | |
*** dprince has quit IRC | 20:08 | |
*** joesavak has joined #openstack-dev | 20:10 | |
*** glenc has quit IRC | 20:24 | |
*** ohnoimdead has joined #openstack-dev | 20:26 | |
*** code_franco has quit IRC | 20:31 | |
*** code_franco has joined #openstack-dev | 20:36 | |
*** vladimir3p has quit IRC | 20:40 | |
*** lorin1 has joined #openstack-dev | 20:40 | |
*** amccabe has quit IRC | 20:43 | |
*** glenc has joined #openstack-dev | 20:45 | |
openstackgerrit | Brian Waldon proposed a change to openstack/glance: Implementing changes-since param in api & registry https://review.openstack.org/386 | 20:47 |
openstackgerrit | Brian Waldon proposed a change to openstack/glance: Param is now functional https://review.openstack.org/387 | 20:47 |
openstackgerrit | Brian Waldon proposed a change to openstack/glance: Adding default updated_at value https://review.openstack.org/388 | 20:47 |
bcwaldon_ | oh lord | 20:48 |
bcwaldon_ | that was an accident | 20:48 |
mtaylor | bcwaldon_: :) | 20:48 |
bcwaldon_ | mtaylor: you know how to fix it? | 20:49 |
bcwaldon_ | they should all be condensed into one | 20:49 |
mtaylor | bcwaldon_: well, first step will be doing a rebase -i and squashing them in to one commit (do you know how to do that?) | 20:49 |
bcwaldon_ | no :( | 20:49 |
mtaylor | bcwaldon_: in your shell, run "git fetch ; git rebase -i origin/master" | 20:50 |
bcwaldon_ | assuming origin is openstack? | 20:51 |
mtaylor | bcwaldon_: origin is a magic word in git | 20:51 |
bcwaldon_ | right, I was using my own fork as origin | 20:51 |
mtaylor | either way should work fine | 20:51 |
bcwaldon_ | i have github.com/openstack set up as a remote | 20:51 |
mtaylor | still should be fine - the main key here is making sure that it squashes down everything that isn't upstream - so rebasing on your fork should still be o | 20:52 |
mtaylor | ok | 20:52 |
bcwaldon_ | ok, can you explain exactly what rebase is doing? | 20:53 |
mtaylor | then in the editor - just change the work "pick" to "squash" for the commits that aren't the first one in the list | 20:53 |
mtaylor | yes | 20:53 |
mtaylor | currently you have 3 commits on top of a particular point in the history of your repo, yeah? | 20:53 |
bcwaldon_ | yep | 20:54 |
bcwaldon_ | ok, rebase complete | 20:54 |
mtaylor | what we're doing here is a) telling git that you want to apply those commits on top of a particular point in the history (in this case, it happens to be the same one they were already on top of) | 20:54 |
mtaylor | b) telling it you want to combine the effects of those into _one_ patch rathat than in to three | 20:55 |
bcwaldon_ | gotcha | 20:55 |
mtaylor | so - at this point, if you do "git log" you should see one commit and then the stuff that was there before you started work, yeah? | 20:55 |
bcwaldon_ | yes | 20:55 |
mtaylor | sweet | 20:55 |
mtaylor | and you kept the commit message (along with the change-id) from the top commit, yeah? | 20:56 |
bcwaldon_ | yes | 20:56 |
mtaylor | perfect | 20:56 |
bcwaldon_ | well | 20:56 |
bcwaldon_ | I have all 4 commit messages | 20:56 |
bcwaldon_ | so 4 changeids | 20:56 |
mtaylor | cool. well, let's clean that up a little too | 20:56 |
mtaylor | do | 20:56 |
mtaylor | git commit --amend | 20:56 |
mtaylor | which will recommit letting you edit the commit message | 20:56 |
bcwaldon_ | ok | 20:57 |
bcwaldon_ | So I'm guessing you want me to remove all but the top commit message/changeid | 20:57 |
mtaylor | then make one nice commit message which contains a nice short first line subject, then a description of the change (if the subject doesn't cover it) and ends with the Change-Id line for the top one | 20:58 |
mtaylor | essentially, yes | 20:58 |
bcwaldon_ | excellent | 20:58 |
bcwaldon_ | complete | 20:58 |
mtaylor | sweet | 20:58 |
mtaylor | now, if you do git review, it _should_ ammend the review for https://review.openstack.org/386 | 20:58 |
openstackgerrit | Brian Waldon proposed a change to openstack/glance: More functional changes https://review.openstack.org/389 | 20:58 |
openstackgerrit | Brian Waldon proposed a change to openstack/glance: Implementing changes-since param in api & registry https://review.openstack.org/386 | 20:58 |
mtaylor | hrm | 20:58 |
mtaylor | where did the More functional changes change come from? | 20:59 |
bcwaldon_ | I really can't explain it | 21:00 |
bcwaldon_ | that was my original second commit | 21:00 |
bcwaldon_ | no, original last commit | 21:00 |
mtaylor | hrm. let me look at something real quick | 21:00 |
* mtaylor wants to make sure I haven't been giving bad advice | 21:00 | |
bcwaldon_ | my 'git log' shows a single change w/ the I1 change id | 21:00 |
*** jsavak has joined #openstack-dev | 21:00 | |
bcwaldon_ | so we are good on the one review (386) | 21:02 |
bcwaldon_ | we just need to remove the 3 subsequent reviews | 21:02 |
jeblair | bcwaldon_: hit the "Abandon Change" button on the reviews you don't want | 21:02 |
*** joesavak has quit IRC | 21:02 | |
mtaylor | well... I pulled 389 and it looks like there are four changes there - so I'd love to figure out what state your local repo is in (just want to make sure you're not in a bad place) | 21:02 |
mtaylor | jeblair: could you take a look at 386 and 389? 389 looks quite unsquashed | 21:03 |
bcwaldon_ | looking at the diff (locally) it's all there | 21:03 |
bcwaldon_ | and like I said, the log looks good | 21:03 |
notmyname | mtaylor: jeblair: got a question about gerrit's version of gated trunk. is it feasible to tag the canonical repo? | 21:04 |
bcwaldon_ | mtaylor: am I cool to abandon 387, 388, 389 in gerrit? | 21:04 |
jeblair | mtaylor: i'm not sure what i can tell about 389 without knowing the state of the originating repo. | 21:05 |
jeblair | it has a dependency.. | 21:05 |
jeblair | that's about it | 21:05 |
mtaylor | notmyname: yes. is there a specific thing you want to do? | 21:05 |
*** lorin1 has quit IRC | 21:07 | |
notmyname | mtaylor: on the github mirror, I was tagging at each release. but I don't have push access now... :-) | 21:07 |
mtaylor | bcwaldon_: would you do this: git checkout -b 386 ; git reset --hard 3cd46135c9926684858b08f4583844b7dbab1ba7 ; git pull gerrit refs/changes/86/386/2 | 21:07 |
mtaylor | bcwaldon_: and then verify that the things look good there? (I just want to make sure things are good before we start abandoning things) | 21:07 |
mtaylor | notmyname: yes. I am very much in favor of doing that ... the intent from my end was to have the release job make the tag automatically and push it back to gerrit | 21:08 |
notmyname | mtaylor: ok, that would be cool | 21:08 |
jeblair | what's the current release management process for swift? | 21:09 |
mtaylor | jeblair: in theory, it's contained here: http://wiki.openstack.org/HowToRelease | 21:09 |
*** martine has quit IRC | 21:09 | |
mtaylor | notmyname: in practice, is that about right? | 21:09 |
jeblair | oh, i thought swift was different somehow | 21:10 |
notmyname | ttx handles all that :-) | 21:10 |
bcwaldon_ | mtaylor: things look good. deployed 386 and functionally tested | 21:10 |
notmyname | the only (current) differences with swift, as far as I know, are the version number and the date | 21:10 |
mtaylor | notmyname: have you been tagging _before_ handing to ttx or after? | 21:10 |
notmyname | jeblair: ^ | 21:10 |
mtaylor | bcwaldon_: awesome. then just abandon those other changes | 21:10 |
bcwaldon_ | ok | 21:10 |
bcwaldon_ | mtaylor: thanks a ton for helping out. Would not have figured that out on my own | 21:11 |
notmyname | mtaylor: I have no idea if the bzr repo was tagged. I was maintaining the github mirror myself and adding the tag to the correct commit | 21:11 |
mtaylor | notmyname: awesome | 21:11 |
jeblair | ttx has the required permissions to tag | 21:11 |
mtaylor | notmyname: well, I'd love to make that just work | 21:11 |
jeblair | so he should be tagging the canonical repo this time | 21:11 |
mtaylor | jeblair: great | 21:11 |
jeblair | assuming that doesn't get completely automated by then | 21:11 |
*** bcwaldon_ has quit IRC | 21:12 | |
jeblair | http://wiki.openstack.org/GerritWorkflow#Tagging_a_Release | 21:12 |
jeblair | (essentially, that's docs for ttx, not things devs or ptls have to do, but that's the process for reference) | 21:12 |
*** cp16net has quit IRC | 21:29 | |
*** code_franco has quit IRC | 21:38 | |
*** code_franco has joined #openstack-dev | 21:40 | |
*** code_franco has quit IRC | 21:41 | |
*** code_franco has joined #openstack-dev | 21:41 | |
openstackgerrit | James E. Blair proposed a change to openstack/openstack-ci: Sync doc-core group to gerrit. https://review.openstack.org/390 | 21:50 |
*** lts has quit IRC | 21:50 | |
openstackgerrit | gholt proposed a change to openstack/swift: Updating changelog for 1.4.3 https://review.openstack.org/391 | 21:55 |
*** mattray has joined #openstack-dev | 21:56 | |
*** jsavak has quit IRC | 21:57 | |
*** jakedahn has quit IRC | 21:58 | |
openstackgerrit | Verification of a change to openstack/swift failed: Updating changelog for 1.4.3 https://review.openstack.org/391 | 22:00 |
notmyname | mtaylor: why did that happen^ | 22:03 |
notmyname | the only change was a text file! | 22:03 |
*** jaypipes has quit IRC | 22:04 | |
*** kbringard has quit IRC | 22:04 | |
openstackgerrit | A change was merged to openstack/swift: Updating changelog for 1.4.3 https://review.openstack.org/391 | 22:06 |
*** Tushar has quit IRC | 22:06 | |
notmyname | jeblair: mtaylor: who does gerrit email? I got emails, but gholt didn't (he submitted the code, I reviewed it) | 22:08 |
notmyname | jeblair: mtaylor: current swift trunk is ready for 1.4.3 (ie tag can be pushed) | 22:09 |
*** bengrue has quit IRC | 22:10 | |
openstackgerrit | John Dickinson proposed a change to openstack/swift: bumped version to 1.4.4 https://review.openstack.org/392 | 22:11 |
jeblair | notmyname: email is user-selectable via https://review.openstack.org/#settings,projects | 22:13 |
notmyname | jeblair: mtaylor: ttx: swift version 1.4.3 is at commit ba57e6ec04d26e83fc83732f63817ebec89a4368 | 22:13 |
jeblair | notmyname, gholt: he may need to register a project watch if he doesn't have one already. we try to create them based on group membership on launchpad, but not everyone is in the groups they want to watch | 22:14 |
openstackgerrit | A change was merged to openstack/swift: bumped version to 1.4.4 https://review.openstack.org/392 | 22:15 |
jeblair | notmyname: ttx may be asleep, can you email that to him? | 22:15 |
notmyname | he'll see it in the morning ;-) | 22:15 |
openstackgerrit | Yogeshwar Srikrishnan proposed a change to openstack/keystone: Fixing sample content. https://review.openstack.org/393 | 22:29 |
*** mattray has quit IRC | 22:31 | |
*** mfer has quit IRC | 22:34 | |
*** vladimir3p has joined #openstack-dev | 22:34 | |
*** ewindisch_ has quit IRC | 22:35 | |
*** ewindisch_ has joined #openstack-dev | 22:36 | |
*** ewindisch_ has quit IRC | 22:38 | |
*** serveradmin4uk has joined #openstack-dev | 22:38 | |
serveradmin4uk | progress pls! | 22:40 |
*** dragondm has quit IRC | 22:41 | |
openstackgerrit | A change was merged to openstack/openstack-ci: Sync doc-core group to gerrit. https://review.openstack.org/390 | 22:42 |
openstackgerrit | A change was merged to openstack/openstack-ci: Add bare-metal helper scripts. https://review.openstack.org/385 | 22:42 |
*** jakedahn has joined #openstack-dev | 22:44 | |
*** rnorwood has quit IRC | 22:45 | |
*** dragondm has joined #openstack-dev | 22:57 | |
*** dragondm has quit IRC | 23:11 | |
*** mfer has joined #openstack-dev | 23:12 | |
*** serveradmin4uk has quit IRC | 23:29 | |
*** ewindisch_ has joined #openstack-dev | 23:35 | |
*** mfer has quit IRC | 23:37 | |
*** ohnoimdead has quit IRC | 23:42 | |
*** mgius has quit IRC | 23:52 | |
*** mszilagyi has quit IRC | 23:58 |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!