*** mattf has joined #openstack-sahara | 00:12 | |
*** ErikB has quit IRC | 00:17 | |
*** ErikB1 has joined #openstack-sahara | 00:23 | |
*** rhodgin has joined #openstack-sahara | 00:36 | |
*** ErikB1 has quit IRC | 00:44 | |
openstackgerrit | Fengqian Gao proposed a change to openstack/sahara: Keep python 3.X compatibility for xrange https://review.openstack.org/79849 | 02:07 |
---|---|---|
*** witlessb has joined #openstack-sahara | 02:56 | |
*** witlessb has quit IRC | 02:56 | |
*** rhodgin has quit IRC | 03:56 | |
*** mattf is now known as _mattf | 04:36 | |
*** Ch00k has joined #openstack-sahara | 06:08 | |
*** Ch00k has quit IRC | 07:08 | |
*** Ch00k has joined #openstack-sahara | 07:30 | |
*** Ch00k has quit IRC | 07:38 | |
*** Ch00k has joined #openstack-sahara | 07:44 | |
*** Ch00k has quit IRC | 07:56 | |
*** openstack has quit IRC | 08:21 | |
*** openstack has joined #openstack-sahara | 08:29 | |
-dickson.freenode.net- [freenode-info] why register and identify? your IRC nick is how people know you. http://freenode.net/faq.shtml#nicksetup | 08:29 | |
openstackgerrit | Sergey Lukjanov proposed a change to openstack/python-saharaclient: Implement "sahara --version" https://review.openstack.org/80631 | 08:34 |
*** IvanBerezovskiy has joined #openstack-sahara | 08:41 | |
*** dmitryme has joined #openstack-sahara | 08:42 | |
*** Ch00k has joined #openstack-sahara | 08:51 | |
*** witlessb has joined #openstack-sahara | 08:59 | |
openstackgerrit | Ivan Berezovskiy proposed a change to openstack/sahara-image-elements: Fix cookie for java download https://review.openstack.org/80930 | 09:04 |
openstackgerrit | A change was merged to openstack/sahara-image-elements: Fix cookie for java download https://review.openstack.org/80930 | 09:14 |
*** Ch00k has quit IRC | 09:27 | |
*** Ch00k has joined #openstack-sahara | 09:27 | |
openstackgerrit | Alexander Ignatov proposed a change to openstack/sahara: Replaced or removed Savanna words in comments https://review.openstack.org/80589 | 09:33 |
openstackgerrit | A change was merged to openstack/python-saharaclient: Change packaging references to python-saharaclient https://review.openstack.org/79979 | 10:00 |
openstackgerrit | A change was merged to openstack/python-saharaclient: Change internal variables and classes to 'sahara' https://review.openstack.org/79992 | 10:00 |
openstackgerrit | Sergey Lukjanov proposed a change to openstack/python-saharaclient: Implement "sahara --version" https://review.openstack.org/80631 | 10:38 |
*** tosky has joined #openstack-sahara | 10:45 | |
*** openstackgerrit has quit IRC | 11:10 | |
*** openstackgerrit has joined #openstack-sahara | 11:10 | |
*** _mattf is now known as mattf | 11:12 | |
*** mattf is now known as _mattf | 11:52 | |
*** ErikB has joined #openstack-sahara | 12:07 | |
*** YaroslavLobankov has joined #openstack-sahara | 12:13 | |
*** _mattf is now known as mattf | 12:16 | |
openstackgerrit | A change was merged to stackforge/puppet-sahara: Fix gitreview config (rename savanna to sahara) https://review.openstack.org/80638 | 12:19 |
*** dmitryme has quit IRC | 12:28 | |
*** dmitryme has joined #openstack-sahara | 12:57 | |
openstackgerrit | Sergey Reshetnyak proposed a change to openstack/sahara-image-elements: Use specific oozie for hadoop 2 plugin https://review.openstack.org/80610 | 13:07 |
openstackgerrit | A change was merged to openstack/sahara: Renamed all swift-dependent configs to sahara https://review.openstack.org/79952 | 13:19 |
*** rhodgin has joined #openstack-sahara | 13:21 | |
IvanBerezovskiy | mattf, ping | 13:24 |
*** elmiko has joined #openstack-sahara | 13:33 | |
mattf | IvanBerezovskiy, pong | 13:48 |
IvanBerezovskiy | mattf, what OS host did you use when you get https://bugs.launchpad.net/sahara/+bug/1292614 ? | 13:49 |
mattf | IvanBerezovskiy, rhel 6.5 | 13:53 |
tosky | also F20 | 13:53 |
mattf | IvanBerezovskiy, tosky found something online about a similar issue w/ debian & selinux. it is supposedly an issue w/ not having /selinux mounted in the chroot, so there's no way to tell if the action should be allowed or not | 13:54 |
mattf | tosky, i have "rhel 6.5" in the description already, feel free to edit it and add "f20" | 13:54 |
*** dmitryme has quit IRC | 13:54 | |
mattf | oh, el6 is in the bug summary too, might wwant to add f20 there as well | 13:54 |
tosky | done :) | 13:55 |
IvanBerezovskiy | mattf, I am testing f19 now as host | 13:55 |
IvanBerezovskiy | mattf, but the 'error: Failed to execute command' is the error of augeas. It couldn't parse /etc/ssh/ssh_config and I can't understand why | 13:56 |
tosky | IvanBerezovskiy: right, but the "passwd" part comes from the subsequent execution of passwd | 13:57 |
tosky | so in fact there are two issues | 13:57 |
IvanBerezovskiy | the same problem is on f19 too | 13:57 |
mattf | hmm, that's probably my bad for not investigating further. i just generated the bug report and soldiered on. | 13:57 |
mattf | anyone should feel free to edit the description and make it clear that there are two errors in the message. maybe it's one root cause (i hope) maybe it isn't. | 13:58 |
mattf | IvanBerezovskiy, btw, it might be that augtool is being blocked by selinux and augtool isn't selinux-aware so it's providing a useful error message like passwd does | 13:59 |
IvanBerezovskiy | mattf, did you try to disable selinux? | 14:02 |
mattf | not disabled entirely. i did "with selinux in enforcing or permissive mode" | 14:03 |
tosky | IvanBerezovskiy: setenforce 0 (with selinux enabled the script terminated before that, in the package installation ) | 14:03 |
mattf | that means selinux is on and permissive means selinux won't stop operations, only report them | 14:03 |
mattf | if tosky's link is correct, the fix for this may actually have to be in dib itself | 14:04 |
*** jimbobhickville has joined #openstack-sahara | 14:13 | |
openstackgerrit | Alexander Ignatov proposed a change to openstack/sahara: Replaced all Savanna words in class names https://review.openstack.org/80562 | 14:13 |
*** tmckay has joined #openstack-sahara | 14:16 | |
IvanBerezovskiy | mattf, do you mean to disable selinux before image build? | 14:17 |
openstackgerrit | Alexander Ignatov proposed a change to openstack/sahara: Replaced or removed Savanna words in comments https://review.openstack.org/80589 | 14:18 |
IvanBerezovskiy | disabling selinux on host resolves problem with passwdm but not with augeas | 14:20 |
mattf | IvanBerezovskiy, how are you disabling selinux? | 14:22 |
IvanBerezovskiy | mattf, i am using 'setenforce 0' | 14:23 |
mattf | that wasn't sufficient for me on el6 | 14:24 |
mattf | tosky, did that work for you on f20? | 14:24 |
tosky | mattf: no, it didn't; I had to disable it from the beginning because of another error (found also by elmiko), a multiarch issue at the beginning of the installation in the chroot | 14:25 |
openstackgerrit | Trevor McKay proposed a change to openstack/sahara: Move the savanna subdir to sahara https://review.openstack.org/80591 | 14:26 |
mattf | tosky, the multi arch was the ntp error? | 14:27 |
tosky | mattf: no | 14:27 |
mattf | darn | 14:28 |
IvanBerezovskiy | mattf, now i change mode to permissive, and passwd works on f19 | 14:29 |
mattf | setenforce 0 == permissive | 14:29 |
IvanBerezovskiy | mattf, oh, sorry :) | 14:30 |
IvanBerezovskiy | mattf, Now I am testing centos 6.5 as host | 14:30 |
tosky | mattf: error I got with selinux enforcing http://www.fpaste.org/86054/13950666/ | 14:30 |
tosky | elmiko: wasn't it the same error you have seen? ^^^ | 14:31 |
elmiko | tosky, yup. exactly | 14:31 |
IvanBerezovskiy | I saw this error too one time | 14:32 |
IvanBerezovskiy | tosky, why didn't you use 'base' element? | 14:33 |
IvanBerezovskiy | tosky, ah sorry, it's hdp image | 14:34 |
tosky | IvanBerezovskiy: yep | 14:34 |
aignatov | tmckay: here? | 14:35 |
aignatov | I see you sent new patch | 14:36 |
aignatov | about renaming root dirt savanna to sahara | 14:36 |
*** dmitryme has joined #openstack-sahara | 14:36 | |
tmckay | aignatov, hi | 14:38 |
aignatov | actually today I worked in that too | 14:38 |
aignatov | I've fixed all pep8, py27 and saw edp job running on it | 14:38 |
tmckay | aignatov, oh, okay. I just re-ran the commands I posted because gerrit told me I coudn't merge :) | 14:39 |
tmckay | aignatov, should I abandon my change then? | 14:39 |
aignatov | no | 14:39 |
aignatov | I will sent on top of your patch | 14:39 |
tmckay | okay | 14:39 |
aignatov | let me a while | 14:39 |
aignatov | 20-30 mins | 14:39 |
tmckay | aignatov, no problem. I'll check the blueprints and see if I can find something else that needs to be done. | 14:40 |
SergeyLukjanov | mattf, are you ok w/ https://review.openstack.org/#/c/80631/ ? | 14:41 |
mattf | tosky, that is a strange error | 14:42 |
mattf | SergeyLukjanov, looks pretty good. where's the code coming from? | 14:43 |
mattf | folks just mailing you patches? | 14:43 |
SergeyLukjanov | mattf, nope, I've just rebased it | 14:43 |
SergeyLukjanov | mattf, see previous patch sets | 14:44 |
mattf | ahh, i should have looked all the way to patch set 1 | 14:44 |
mattf | i looked at 2 & 3 | 14:44 |
SergeyLukjanov | mattf, yup :) | 14:44 |
mattf | +2'd | 14:44 |
aignatov | tmckay: When I'll send you can work on further renaming like "savanna" in strings | 14:44 |
SergeyLukjanov | mattf, my first attempt was disappointed pep8 | 14:45 |
tmckay | aignatov, okay, great, thanks | 14:45 |
openstackgerrit | Chad Roberts proposed a change to openstack/sahara-dashboard: Adapting to use the python-saharaclient library https://review.openstack.org/80987 | 14:45 |
mattf | fyi folks, i'm going to be out of the office after today. i'll be back friday. i'll miss the team meeting this week. if anyone needs me email will be the best mechanism, and i may only be checking it in the evenings. | 14:47 |
SergeyLukjanov | mattf, if vacation, than have a good rest | 14:48 |
tmckay | hmm, crobertsrh, did you have to do anything special to get your CRs to show up on the renaming blueprint with "Addressed by?" | 14:49 |
tmckay | mine for the client don't show up. not sure why. Except that I wrote "Partial-implements" with a small i ... ?? | 14:49 |
crobertsrh | Just the partial-implements line in the commit does it | 14:49 |
tmckay | hmm. Well, they're merged now. I suppose I can list them by hand | 14:50 |
crobertsrh | I suppose case could matter, but it would be a strange place for case to matter | 14:50 |
tmckay | yeah, agreed. The only other thing I can think of is that I added a manual line to the whiteboard first. | 14:51 |
tmckay | also seems fragile | 14:51 |
openstackgerrit | Alexander Ignatov proposed a change to openstack/sahara: Move the savanna subdir to sahara https://review.openstack.org/80591 | 14:52 |
aignatov | tmckay: I'm done | 14:53 |
tmckay | aignatov, okay, thanks. | 14:53 |
aignatov | so, what's we have now to finish renaming | 14:54 |
mattf | SergeyLukjanov, sadly no. i could use some vacation. i'll be in nyc for structure | 14:54 |
SergeyLukjanov | mattf, then good luck | 14:54 |
aignatov | 1) we need to rename savanna-db to internal-db | 14:54 |
tmckay | aignatov, are you thinking we should put any remaining changes in that CR? | 14:54 |
aignatov | I think yes | 14:55 |
tmckay | or separate? | 14:55 |
tmckay | oka | 14:55 |
aignatov | also we need to update entry points in setup.cfg | 14:56 |
aignatov | but it should be in sync with integration tests | 14:57 |
openstackgerrit | Chad Roberts proposed a change to openstack/sahara-dashboard: Adapting to use the python-saharaclient library https://review.openstack.org/80987 | 15:09 |
IvanBerezovskiy | tosky, I can't reproduce your issue with glibc-common. I tested on f19 and centos 6.5 | 15:12 |
tosky | IvanBerezovskiy: uhm, interesting; I'm on F20 thought, did you try with selinux enforcing? | 15:13 |
IvanBerezovskiy | tosky, if selinux is enforcing build fails on root-passwd element as it's described in bug | 15:14 |
elmiko | tosky, IvanBerezovskiy, i reran the diskimage-create from the trunk of sahara-image-elements on f20, i still get the glibc bug | 15:14 |
openstackgerrit | A change was merged to openstack/sahara: Update i18n config due to the renaming https://review.openstack.org/80581 | 15:14 |
tosky | elmiko: and you are on F20 too if I remember correctly | 15:14 |
elmiko | tosky, yes | 15:14 |
IvanBerezovskiy | tosky, I can try on f20 too | 15:15 |
tosky | IvanBerezovskiy: if you can, yes please :) | 15:15 |
elmiko | and i ran 'sudo diskimage-create.sh -p hdp -v 2' | 15:15 |
aignatov | tmckay: I was wrong | 15:16 |
tmckay | heh, about what? | 15:16 |
aignatov | we should not put further renaming changes on the latest one | 15:16 |
aignatov | we need to create new ones if needed | 15:16 |
aignatov | logically separated patches | 15:17 |
tmckay | :) Okay. I just moved savanna-db to internal-db, but I'll fix it. | 15:17 |
aignatov | tmckay: thx | 15:18 |
tmckay | aignatov, np | 15:18 |
aignatov | SergeyLukjanov: let's merge this https://review.openstack.org/#/c/80562/ | 15:19 |
openstackgerrit | Erik Bergenholtz proposed a change to openstack/sahara: Renames all doc references from Savanna to Sahara https://review.openstack.org/80069 | 15:29 |
aignatov | folks, please take a look https://review.openstack.org/#/c/80589/ | 15:33 |
tosky | IvanBerezovskiy, mattf: it seems that the download of java does not work anymore: http://www.fpaste.org/86089/95070484/ | 15:35 |
IvanBerezovskiy | tosky, I have tested wget with that cookie and our java download link. It worked | 15:37 |
aignatov | SergeyLukjanov: here? | 15:37 |
aignatov | is it possible to send CR to the savanna-ci scripts? | 15:37 |
tosky | IvanBerezovskiy: and it was working for me too last week | 15:38 |
IvanBerezovskiy | tosky, https://review.openstack.org/#/c/80930/ | 15:39 |
IvanBerezovskiy | tosky, it was merged today | 15:39 |
tosky | IvanBerezovskiy: argh, I didn't update in the last hours | 15:39 |
*** sballe has joined #openstack-sahara | 15:39 | |
tosky | sorry for the noise | 15:39 |
IvanBerezovskiy | tosky, np | 15:40 |
tosky | is openjdk not supported, btw? | 15:40 |
IvanBerezovskiy | tosky, if java_link isn't set, we'll install default-jre (java) package | 15:42 |
tosky | IvanBerezovskiy: I see, but in diskimage-create JAVA_DOWNLOAD_URL is always set for vanilla apache | 15:44 |
tosky | s/apache/hadoop/ | 15:44 |
IvanBerezovskiy | tosky, it's just defaults. I am not sure but as I remember I built image with openjdk-7 and it worked | 15:46 |
tosky | if it is the same, I would vote for openjdk as default, but I'm the last one here :) | 15:46 |
IvanBerezovskiy | tosky, I can't remember reason why we chose non-distro java | 15:50 |
aignatov | crobertsrh: can we merge this https://review.openstack.org/#/c/80257/ ? | 15:51 |
aignatov | I think we should not wait here to +1 from savanna-ci | 15:51 |
IvanBerezovskiy | tosky, my f20 is very slow, so I'll know result of image build only tomorrow | 15:54 |
tosky | IvanBerezovskiy: np, thanks for checking | 15:55 |
ErikB | Team - this image: https://docs.google.com/drawings/d/1kCahSrGI0OvPeQBcqjX9GV54GZYBZpt_W4nOt5nsKB8/edit what is EHO and is this what the image should say? It used to say Savanna; was just about to change it Sahara... | 16:01 |
*** IvanBerezovskiy has left #openstack-sahara | 16:02 | |
openstackgerrit | A change was merged to openstack/sahara-dashboard: Rename namespace to match new dashboard slug https://review.openstack.org/80257 | 16:10 |
openstackgerrit | A change was merged to openstack/sahara-dashboard: Renaming internal variables away from savanna https://review.openstack.org/80360 | 16:11 |
crobertsrh | aignatov: yes, I think that should be fine | 16:15 |
openstackgerrit | Andrew Lazarev proposed a change to openstack/sahara: Renamed 'idh' integration tests to 'idh2' https://review.openstack.org/80405 | 16:41 |
*** Ch00k has quit IRC | 16:51 | |
tmckay | aignatov, ping | 16:52 |
aignatov | tmckay: pong | 16:53 |
tmckay | hi, https://review.openstack.org/#/c/80591/5/sahara/cli/savanna_api.py, my comment on line 32. Is this something we missed? | 16:53 |
aignatov | I see, but it worked in my env, in this patch I've just fixed all blockers from running unit tests pep8 checks | 16:54 |
aignatov | so with the current state in this file it works :) | 16:54 |
tmckay | okay, but it has to change, right? Should I fix it now? | 16:55 |
mattf | anyone thought of a jenkins test that -1's new occurrences of "savanna"? | 16:55 |
tmckay | mattf, I suggested something like that a while back. I think I was informally voted down | 16:56 |
mattf | doh | 16:56 |
openstackgerrit | Chad Roberts proposed a change to openstack/sahara-dashboard: Changing savanna_tag_image as part of rename project https://review.openstack.org/81016 | 16:56 |
aignatov | tmckay: ok, also could you please fix doc build issue | 16:57 |
aignatov | I see Jenkns put -1 to me :) | 16:57 |
tmckay | aignatov, ok. also, run_tests.sh currently breaks because of the unit test import. I should fix that too. Lots of little things to fix. | 16:58 |
aignatov | yes, just add description of these fixes to the commit message :) | 16:59 |
aignatov | I didn't test run_tests.sh because alway run 'fox -epy27' | 17:00 |
aignatov | *fox -> tox xD | 17:00 |
*** bradd1 has joined #openstack-sahara | 17:05 | |
openstackgerrit | Chad Roberts proposed a change to openstack/sahara-dashboard: Changing savanna_tag_image as part of rename project https://review.openstack.org/81016 | 17:07 |
*** mattf is now known as _mattf | 17:17 | |
crobertsrh | tmckay, aignatov: Is a commit for savanna-db --> internal-db coming soon? I'd like to be able to reference that CR when I do the dashboard CR. | 17:19 |
aignatov | I can do it right now | 17:20 |
aignatov | but | 17:20 |
aignatov | not sure on what will be the parent commit of it | 17:21 |
tmckay | crobertsrh, I have a patch for that but I'm having merge conflict problems with the dependency change | 17:21 |
tmckay | chain | 17:21 |
crobertsrh | Ok, totally understandable | 17:21 |
openstackgerrit | Alexander Ignatov proposed a change to openstack/sahara: Replaced all Savanna words in class names https://review.openstack.org/80562 | 17:21 |
openstackgerrit | Alexander Ignatov proposed a change to openstack/sahara: Replaced or removed Savanna words in comments https://review.openstack.org/80589 | 17:22 |
openstackgerrit | Chad Roberts proposed a change to openstack/sahara-dashboard: Changing savanna_tag_image as part of rename project https://review.openstack.org/81016 | 17:22 |
aignatov | tmckay: probably we can upload fast change to replacing savanna-db to internal-db | 17:23 |
openstackgerrit | Chad Roberts proposed a change to openstack/sahara-dashboard: Changing configuration from SAVANNA to SAHARA https://review.openstack.org/81026 | 17:24 |
aignatov | what do you think? | 17:24 |
aignatov | I mean just lets upload it against master | 17:24 |
tmckay | aignatov, yes, it doesn't even really have to be in the dep chain. We can move it later if we need to | 17:24 |
tmckay | agreed, I'll do it... I already have db.patch | 17:24 |
aignatov | very nice :) | 17:25 |
aignatov | SergeyLukjanov: if https://review.openstack.org/80562 and https://review.openstack.org/80589 will get +1 from savanna-ci, merge it w/o additional +2 | 17:27 |
aignatov | I've just rebased both and savanna-ci already had +1 there | 17:27 |
aignatov | crazy renaming :x | 17:28 |
tmckay | Maybe we could have just bought the other company/project | 17:31 |
aignatov | hehe | 17:33 |
*** Ch00k has joined #openstack-sahara | 17:35 | |
openstackgerrit | Trevor McKay proposed a change to openstack/sahara: Change the 'savanna-db' scheme to 'internal-db' https://review.openstack.org/81028 | 17:35 |
tmckay | crobertsrh, there you go ^^ | 17:36 |
crobertsrh | thanks | 17:36 |
*** dmitryme has quit IRC | 17:38 | |
SergeyLukjanov | _mattf, it could be easily added to pep8job | 17:42 |
openstackgerrit | Chad Roberts proposed a change to openstack/sahara-dashboard: Changing savanna-db to internal-db https://review.openstack.org/81029 | 17:43 |
SergeyLukjanov | folks, what's the progress of client renaming? | 17:47 |
SergeyLukjanov | tmckay ^^ | 17:48 |
SergeyLukjanov | I'm thinking about releasing 0.6.0 sahara client to start using it in all other projects | 17:49 |
crobertsrh | Client renaming looks good to me, but I've only been using it for about a day now. | 17:49 |
tmckay | SergeyLukjanov, I think it's done. For some reason, the CRs didn't show up on the whiteboard, I think maybe because I wrote "Partial-implements" without a capital 'I' | 17:49 |
tmckay | no other idea why | 17:49 |
SergeyLukjanov | tmckay, ok, thx | 17:52 |
SergeyLukjanov | tmckay, I'll re-check how it installs today and push tag | 17:52 |
tmckay | SergeyLukjanov, ack | 17:53 |
SergeyLukjanov | tmckay, I've added links to the CRs to the bp | 17:58 |
SergeyLukjanov | https://blueprints.launchpad.net/sahara/+spec/savanna-renaming-client | 17:58 |
tmckay | thanks | 17:58 |
SergeyLukjanov | tmckay, I'm waiting for --version support to be landed too | 18:12 |
*** IlyaE has joined #openstack-sahara | 18:14 | |
tmckay | SergeyLukjanov, is there something you need me to do there? | 18:16 |
SergeyLukjanov | tmckay, I think nope | 18:17 |
SergeyLukjanov | tmckay, have you tested the client using your brand new integration tests? | 18:17 |
tmckay | heh, yes :) Not since Thursday, but the last time I made a change there I did | 18:17 |
openstackgerrit | Chad Roberts proposed a change to openstack/sahara-dashboard: Remainder of renaming changes from savanna to sahara https://review.openstack.org/81038 | 18:19 |
*** _mattf is now known as mattf | 18:22 | |
SergeyLukjanov | tmckay, that's awesome ;) | 18:22 |
SergeyLukjanov | tmckay, I just don't want to break our fragile world | 18:22 |
SergeyLukjanov | by pushing tag to the client | 18:22 |
openstackgerrit | Trevor McKay proposed a change to openstack/sahara: Move the savanna subdir to sahara https://review.openstack.org/80591 | 18:23 |
tmckay | SergeyLukjanov, ack | 18:24 |
SergeyLukjanov | time to have some coffee | 18:24 |
tmckay | I think this subdir change might be messed up. Too much going on. I may have to make it again. | 18:38 |
*** dmitryme has joined #openstack-sahara | 18:38 | |
* mattf would love to see training whitespace be an auto -1 | 18:49 | |
* tmckay diff patch set 5 and patch set 6 from the command line... | 18:52 | |
dmitryme | tmckay: did you know 'git review' can do that for you? | 18:52 |
openstackgerrit | A change was merged to openstack/python-saharaclient: Implement "sahara --version" https://review.openstack.org/80631 | 18:55 |
tmckay | dmitryme, really? No. | 18:57 |
tmckay | dmitryme, you mean comparing patch sets on screen? | 18:57 |
dmitryme | tmckay: yep | 18:57 |
SergeyLukjanov | openstackgerrit, thx! | 18:58 |
* SergeyLukjanov going to last check sahara client and push 0.6.0 tag | 18:58 | |
dmitryme | git review -m CHANGE_ID,PS[-NEW_PS] | 18:58 |
dmitryme | try to run 'git-review --help' | 18:58 |
dmitryme | (note that it does not work on all systems for some reason) | 18:59 |
dmitryme | (I mean help) | 18:59 |
tmckay | dmitryme, okay, thanks. This is one is really big, and it got into a rebase mess, and I'm afraid I dropped some changes when I reapplied the patch | 18:59 |
dmitryme | one hint: basically 'git review -m' does the following: | 19:00 |
dmitryme | a. it checks out the PatchSet A into one branch | 19:00 |
dmitryme | b. it checks out PatchSet B into another branch | 19:00 |
dmitryme | than it does | 19:00 |
dmitryme | git diff branch_ps_A..branch_ps_B | 19:01 |
dmitryme | I tell you this because in most cases it happens that branch_ps_A and branch_ps_B have different parent commit because of rebase | 19:02 |
dmitryme | and so git review fails to show you the real difference between patch sets | 19:02 |
tmckay | gotcha | 19:02 |
dmitryme | to fix this | 19:03 |
dmitryme | a. checkout branch_ps_A | 19:03 |
dmitryme | then rebase gerrit/master | 19:03 |
dmitryme | b. checkout branch_ps_B | 19:03 |
dmitryme | then rebase gerrit/master | 19:03 |
dmitryme | c. finally manually do | 19:03 |
dmitryme | git diff branch_ps_A..branch_ps_B | 19:03 |
dmitryme | 'git review -m' help there because it at least does checkout for you | 19:04 |
dmitryme | and if you lucky (the patch sets you compare have the same parent), you will not need to rebase manually | 19:05 |
dmitryme | that is all | 19:05 |
tmckay | dmitryme, okay, thanks. I may need that. | 19:08 |
mattf | SergeyLukjanov, have you heard from venza in the past few weeks? | 19:12 |
SergeyLukjanov | mattf, nope IIRC | 19:13 |
mattf | ok | 19:13 |
SergeyLukjanov | mattf, tmckay, I'm pushing client tag in 5 mins | 19:22 |
tmckay | ok | 19:22 |
openstackgerrit | A change was merged to openstack/sahara: Renames all doc references from Savanna to Sahara https://review.openstack.org/80069 | 19:23 |
*** tosky has quit IRC | 19:39 | |
openstackgerrit | Trevor McKay proposed a change to openstack/sahara: Move the savanna subdir to sahara https://review.openstack.org/80591 | 19:47 |
tmckay | dimitryme, thanks, it helped. I think I've got it, now just to run it again with the current patch set | 19:47 |
tmckay | okay, looks like I only have file mode changes left. Not sure how those happened. | 19:50 |
*** crobertsrh has quit IRC | 19:50 | |
*** crobertsrh has joined #openstack-sahara | 19:51 | |
tmckay | aignatov, okay, here is a diff between your change set 5 and my latest on 80591. Do the file modes matter? | 19:52 |
tmckay | aignatov, I think everything else is okay | 19:52 |
tmckay | http://www.fpaste.org/86166/39508587/ | 19:53 |
tmckay | dmitryme, ^^ | 19:53 |
tmckay | looks like the x bit is missing from each of those | 19:54 |
dmitryme | tmckay: I don't think we need x bit for xmls | 19:55 |
tmckay | but the .sh files, probably | 19:55 |
tmckay | hmm, I'll put those back. master has them. no idea how they changed | 19:56 |
*** ruhe has joined #openstack-sahara | 19:57 | |
dmitryme | agree .sh should be executable | 19:57 |
dmitryme | as for xmld, I think that is just a mistake | 19:57 |
dmitryme | but I am ok if we keep it | 19:58 |
dmitryme | s/xmld/xmls/ | 19:58 |
dmitryme | btw, it is strange that your diff is that small | 19:58 |
dmitryme | "Errors running git rebase remotes/gerrit/master" generally means that you have to rebase manually | 19:59 |
dmitryme | the procedure I explained above | 19:59 |
dmitryme | but looks like in your case all was fine | 19:59 |
openstackgerrit | Trevor McKay proposed a change to openstack/sahara: Move the savanna subdir to sahara https://review.openstack.org/80591 | 20:01 |
*** mattf is now known as _mattf | 20:04 | |
tmckay | dmitryme, the trouble I think was with commit 5, where I got into trouble in the first place :) I can try the procedure, just for fun | 20:09 |
dmitryme | tmckay: suite yourself :-) | 20:11 |
*** boris-42 has joined #openstack-sahara | 20:17 | |
*** jimbobhickville has quit IRC | 20:24 | |
*** crobertsrh is now known as _crobertsrh | 20:46 | |
openstackgerrit | Trevor McKay proposed a change to openstack/sahara: Move the savanna subdir to sahara https://review.openstack.org/80591 | 20:52 |
*** Ch00k has quit IRC | 20:55 | |
*** Ch00k has joined #openstack-sahara | 20:56 | |
*** ErikB has quit IRC | 21:01 | |
*** dmitryme has quit IRC | 21:02 | |
*** bradd1 has quit IRC | 21:06 | |
*** ErikB has joined #openstack-sahara | 21:08 | |
openstackgerrit | A change was merged to openstack/sahara-extra: Rename Savanna to Sahara https://review.openstack.org/79590 | 21:11 |
*** tmckay has quit IRC | 21:12 | |
*** ErikB has quit IRC | 21:38 | |
openstackgerrit | Sergey Lukjanov proposed a change to openstack/python-saharaclient: Add README file https://review.openstack.org/81091 | 21:40 |
*** Ch00k has quit IRC | 21:41 | |
openstackgerrit | A change was merged to openstack/sahara: Replaced all Savanna words in class names https://review.openstack.org/80562 | 21:52 |
openstackgerrit | A change was merged to openstack/sahara: Replaced or removed Savanna words in comments https://review.openstack.org/80589 | 21:52 |
*** ErikB has joined #openstack-sahara | 21:57 | |
*** rhodgin has quit IRC | 22:12 | |
*** witlessb has quit IRC | 22:32 | |
*** openstackgerrit has quit IRC | 22:39 | |
*** openstackgerrit has joined #openstack-sahara | 22:39 | |
*** bradd1 has joined #openstack-sahara | 22:45 | |
*** rhodgin has joined #openstack-sahara | 22:52 | |
*** elmiko has quit IRC | 23:01 | |
*** bradd1 has quit IRC | 23:29 | |
*** _mattf is now known as mattf | 23:34 | |
*** IlyaE has quit IRC | 23:50 |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!