*** amrith is now known as _amrith_ | 00:05 | |
openstackgerrit | Petr Malik proposed openstack/trove-integration: Add elements for Cassandra 2.2/3.0 https://review.openstack.org/324042 | 00:07 |
---|---|---|
openstackgerrit | Petr Malik proposed openstack/trove: Add support for Cassandra 2.2 and 3.x https://review.openstack.org/323590 | 00:07 |
*** imandhan has quit IRC | 00:15 | |
*** imandhan has joined #openstack-trove | 00:16 | |
*** imandhan has quit IRC | 00:20 | |
*** stewie925 has quit IRC | 00:47 | |
*** cheneydc has joined #openstack-trove | 00:59 | |
*** georgelorch has joined #openstack-trove | 01:05 | |
*** amit213 has joined #openstack-trove | 01:39 | |
*** amit213 has quit IRC | 01:41 | |
*** amit213 has joined #openstack-trove | 01:44 | |
*** itisha has quit IRC | 02:30 | |
*** links has joined #openstack-trove | 03:35 | |
*** sgotliv has joined #openstack-trove | 03:50 | |
*** sgotliv has quit IRC | 04:10 | |
*** cguadall_ has joined #openstack-trove | 05:27 | |
*** cguadall has quit IRC | 05:30 | |
*** delatte has quit IRC | 05:44 | |
*** rcernin has joined #openstack-trove | 05:48 | |
*** cdelatte has joined #openstack-trove | 06:03 | |
openstackgerrit | Mahito OGURA proposed openstack/trove: Move rabbit option settings from DEFAULT to oslo_messaging_rabbit https://review.openstack.org/323153 | 06:03 |
openstackgerrit | OpenStack Proposal Bot proposed openstack/trove-dashboard: Imported Translations from Zanata https://review.openstack.org/319064 | 06:19 |
*** tesseract- has joined #openstack-trove | 06:53 | |
*** hoonetorg has quit IRC | 07:38 | |
*** cguadall_ has quit IRC | 07:46 | |
*** hoonetorg has joined #openstack-trove | 07:50 | |
*** sgotliv has joined #openstack-trove | 08:31 | |
*** _amrith_ is now known as amrith | 09:37 | |
*** cheneydc has quit IRC | 10:07 | |
*** amrith is now known as _amrith_ | 10:40 | |
*** _amrith_ is now known as amrith | 11:52 | |
*** tellesnobrega is now known as tellesnobrega_af | 12:11 | |
*** hoonetorg has quit IRC | 12:12 | |
*** pmackinn has joined #openstack-trove | 12:22 | |
*** hoonetorg has joined #openstack-trove | 12:27 | |
*** tellesnobrega_af is now known as tellesnobrega | 12:33 | |
*** miqui has joined #openstack-trove | 13:00 | |
*** amrith is now known as _amrith_ | 13:00 | |
*** _amrith_ is now known as amrith | 13:09 | |
*** haypo has left #openstack-trove | 13:30 | |
*** crinkle has quit IRC | 13:35 | |
*** crinkle has joined #openstack-trove | 13:37 | |
*** ewilson has joined #openstack-trove | 13:47 | |
*** twm2016 has joined #openstack-trove | 14:05 | |
*** links has quit IRC | 14:12 | |
*** david-lyle has joined #openstack-trove | 14:44 | |
*** cdelatte has quit IRC | 14:47 | |
*** amrith is now known as _amrith_ | 15:02 | |
*** _amrith_ is now known as amrith | 15:08 | |
*** amrith is now known as _amrith_ | 15:09 | |
*** tellesnobrega is now known as tellesnobrega_af | 15:10 | |
*** _amrith_ is now known as amrith | 15:14 | |
*** tesseract- has quit IRC | 15:59 | |
*** rcernin has quit IRC | 16:01 | |
amrith | pmackinn, yt? | 16:06 |
pmackinn | amrith, yessir | 16:13 |
amrith | pmackinn, I have good news for you | 16:14 |
amrith | you have been selected, randomly, from among millions of people, to receive a piece of good news from me today. | 16:14 |
amrith | that was the good news :) | 16:15 |
amrith | are you near a telephone? | 16:15 |
amrith | have a quick q for you which will take a while to type | 16:15 |
pmackinn | Good News for People Who Love Bad News | 16:15 |
amrith | Good News for People Who Love Bad News AS A SERVICE | 16:16 |
openstackgerrit | Doug Shelley proposed openstack/trove: Change service candidates list for MariaDB https://review.openstack.org/313663 | 16:18 |
*** david-lyle has quit IRC | 16:24 | |
*** stewie925 has joined #openstack-trove | 16:28 | |
stewie925 | hello amrith and tellesnobrega_af , when you have the chance could you review https://review.openstack.org/#/c/312611/? thank you very much | 16:29 |
*** tesseract has joined #openstack-trove | 16:44 | |
*** tesseract has quit IRC | 16:51 | |
*** khushbu has joined #openstack-trove | 16:57 | |
*** sgotliv has quit IRC | 17:06 | |
*** imandhan has joined #openstack-trove | 17:06 | |
*** tellesnobrega_af is now known as tellesnobrega | 17:33 | |
*** jcru has joined #openstack-trove | 17:39 | |
*** links has joined #openstack-trove | 17:56 | |
*** david-lyle has joined #openstack-trove | 18:09 | |
*** jcru has quit IRC | 18:15 | |
*** david-lyle has quit IRC | 18:35 | |
*** ewilson has quit IRC | 18:38 | |
*** links has quit IRC | 18:39 | |
*** jcru has joined #openstack-trove | 18:40 | |
*** ewilson has joined #openstack-trove | 18:40 | |
*** ewilson has quit IRC | 18:41 | |
*** jcru has quit IRC | 18:42 | |
*** ewilson has joined #openstack-trove | 18:43 | |
*** arist has quit IRC | 19:18 | |
*** arist has joined #openstack-trove | 19:19 | |
*** david-lyle has joined #openstack-trove | 19:24 | |
*** openstackstatus has quit IRC | 19:39 | |
*** openstack has joined #openstack-trove | 19:39 | |
*** openstackstatus has joined #openstack-trove | 19:41 | |
*** ChanServ sets mode: +v openstackstatus | 19:41 | |
*** sgotliv has joined #openstack-trove | 19:51 | |
*** david-lyle has quit IRC | 19:57 | |
*** amrith is now known as _amrith_ | 20:07 | |
*** tqtran has joined #openstack-trove | 20:14 | |
*** rcernin has joined #openstack-trove | 20:20 | |
*** ewilson has quit IRC | 20:45 | |
openstackgerrit | Petr Malik proposed openstack/trove: Cleanup guestagent models https://review.openstack.org/278074 | 21:04 |
*** _amrith_ is now known as amrith | 21:30 | |
*** rcernin_ has joined #openstack-trove | 21:38 | |
openstackgerrit | Petr Malik proposed openstack/trove: Cleanup guestagent models https://review.openstack.org/278074 | 21:49 |
*** rcernin_ has quit IRC | 22:06 | |
*** twm2016 has quit IRC | 22:06 | |
*** miqui has quit IRC | 22:15 | |
*** openstackgerrit has quit IRC | 22:19 | |
*** openstackgerrit has joined #openstack-trove | 22:20 | |
openstackgerrit | Petr Malik proposed openstack/trove: Cleanup guestagent models https://review.openstack.org/278074 | 22:20 |
openstackgerrit | Petr Malik proposed openstack/trove-integration: Add elements for Cassandra 2.2/3.0 https://review.openstack.org/324042 | 22:23 |
openstackgerrit | Petr Malik proposed openstack/trove: Add support for Cassandra 2.2 and 3.x https://review.openstack.org/323590 | 22:23 |
stewie925 | hello amrith I have a question on patch 303671 | 22:28 |
stewie925 | patch #303671 | 22:28 |
stewie925 | sorry - https://review.openstack.org/#/c/303671/ | 22:28 |
stewie925 | I see that the patch was made and already given a +2, but the merge resulted in a 'merge conflict' | 22:32 |
stewie925 | i believe this is due to one of the patched modules -specifically cfg.py - that has a patch from review.openstack.org/#/c/308707 which was currently merged | 22:35 |
tellesnobrega | stewie925, hey, if this is a simple merge conflict you can just press rebase on gerrit and it will sort it out | 22:35 |
tellesnobrega | if not, you have to pull master and rebase the code against the master | 22:35 |
stewie925 | hi tellesnobrega | 22:36 |
tellesnobrega | hi stewie925 :) | 22:36 |
stewie925 | so I just do a rebase on parent 308707 is that right? :) | 22:37 |
tellesnobrega | just press rebase on gerrit, since the parent is merged (as I believe) it won't be a problem, if the rebase fails then you will have to pull it and do it manually | 22:39 |
stewie925 | oh just run rebase, yes youre right its already merged | 22:39 |
tellesnobrega | just press rebase, and it will rebase with the master | 22:39 |
*** sgotliv has quit IRC | 22:40 | |
stewie925 | I see, I just tried that, and it gave me an error that says "the change cannot be rebased due to a conflict during merge" | 22:40 |
tellesnobrega | so, you have this code on your machine right? | 22:41 |
stewie925 | yes I do | 22:42 |
tellesnobrega | so, pull in another branch (master) the current code from repo | 22:42 |
tellesnobrega | then go back to the branch with this code and rebase it against master | 22:42 |
tellesnobrega | if I'm not mistaken this will show you the conflicts and you can solve it manually and send it up for review again | 22:43 |
stewie925 | may I ask a question? | 22:44 |
tellesnobrega | sure, go ahead | 22:44 |
stewie925 | what I tried was I went ahead and did a new git clone on trove (containing all the latest codes), and then just updated each of the 8 modules from the latest patc in https://review.openstack.org/#/c/303671/ | 22:45 |
stewie925 | latest patch oops | 22:46 |
tellesnobrega | ok | 22:47 |
tellesnobrega | that works too | 22:47 |
stewie925 | I tested in my machine (pep8 and py27) and they were successful | 22:47 |
tellesnobrega | sounds good, now you have to send it to review using the same commit message (specially Change-id) | 22:48 |
stewie925 | thank you - will do that :) | 22:48 |
tellesnobrega | no problem | 22:48 |
stewie925 | nice to chat with you btw :) thank you for reviewing a few of my trove patches from before | 22:49 |
tellesnobrega | anytime :) | 22:49 |
stewie925 | oh and speaking of which, could you review https://review.openstack.org/#/c/312611 ? hehe no rush - thank you :) | 22:49 |
tellesnobrega | i will try to do so | 22:49 |
* stewie925 bows in appreciation | 22:50 | |
*** imandhan has quit IRC | 23:01 | |
*** rcernin has quit IRC | 23:10 | |
*** david-lyle has joined #openstack-trove | 23:20 | |
*** imandhan has joined #openstack-trove | 23:28 |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!