| *** david-lyle has quit IRC | 00:25 | |
| *** david-lyle has joined #openstack-trove | 00:26 | |
| *** david-lyle has quit IRC | 00:30 | |
| *** khushbu has quit IRC | 00:42 | |
| *** tqtran has quit IRC | 00:46 | |
| *** cheneydc has joined #openstack-trove | 00:57 | |
| *** imandhan has quit IRC | 01:09 | |
| *** imandhan has joined #openstack-trove | 01:09 | |
| *** imandhan has quit IRC | 01:14 | |
| *** stewie925 has quit IRC | 01:45 | |
| *** pmackinn has quit IRC | 02:20 | |
| *** links has joined #openstack-trove | 04:38 | |
| *** sgotliv has joined #openstack-trove | 04:40 | |
| *** rcernin has joined #openstack-trove | 04:58 | |
| *** rcernin has quit IRC | 05:04 | |
| *** johnma has quit IRC | 05:10 | |
| *** johnma has joined #openstack-trove | 05:11 | |
| *** sgotliv has quit IRC | 05:35 | |
| *** rcernin has joined #openstack-trove | 05:46 | |
| *** imandhan has joined #openstack-trove | 06:07 | |
| *** openstackgerrit has quit IRC | 06:17 | |
| *** openstackgerrit has joined #openstack-trove | 06:17 | |
| *** openstackgerrit has quit IRC | 07:03 | |
| *** openstackgerrit has joined #openstack-trove | 07:03 | |
| openstackgerrit | Ishita Mandhan proposed openstack/trove-dashboard: Add backups table to ng-backups panel https://review.openstack.org/276966 | 07:38 |
|---|---|---|
| *** nikhil has quit IRC | 07:58 | |
| *** sgotliv has joined #openstack-trove | 08:04 | |
| *** imandhan has quit IRC | 08:06 | |
| *** imandhan has joined #openstack-trove | 08:06 | |
| *** imandhan has quit IRC | 08:11 | |
| *** fesp has joined #openstack-trove | 08:11 | |
| *** fesp has quit IRC | 08:16 | |
| *** nikhil_ has joined #openstack-trove | 09:17 | |
| *** nikhil_ is now known as Guest27231 | 09:17 | |
| *** rcernin is now known as rcernin|lunch | 09:31 | |
| *** imandhan has joined #openstack-trove | 09:37 | |
| -openstackstatus- NOTICE: CI is experiencing issues with test logs, all jobs are currently UNSTABLE as a result. No need to recheck until this is fixed! Thanks for your patience. | 09:38 | |
| *** pcaruana has joined #openstack-trove | 09:44 | |
| *** logan_ has joined #openstack-trove | 09:57 | |
| *** logan_ is now known as Guest62971 | 09:58 | |
| *** logan- has quit IRC | 09:59 | |
| *** cheneydc has quit IRC | 10:00 | |
| *** hferenc has quit IRC | 10:00 | |
| *** hogepodge has quit IRC | 10:01 | |
| *** Guest62971 is now known as logan- | 10:01 | |
| *** Guest27231 has quit IRC | 10:02 | |
| *** imandhan has quit IRC | 10:08 | |
| -openstackstatus- NOTICE: CI is experiencing issues with test logs, all jobs are currently UNSTABLE as a result. No need to recheck until this is fixed! Thanks for your patience. | 10:10 | |
| *** ChanServ changes topic to "CI is experiencing issues with test logs, all jobs are currently UNSTABLE as a result. No need to recheck until this is fixed! Thanks for your patience." | 10:10 | |
| *** SlickN1k has joined #openstack-trove | 10:13 | |
| *** sgotliv has quit IRC | 10:16 | |
| *** SlickNik has quit IRC | 10:16 | |
| *** SlickN1k is now known as SlickNik | 10:16 | |
| *** rcernin|lunch is now known as rcernin | 10:20 | |
| *** Guest27231 has joined #openstack-trove | 10:41 | |
| *** hogepodge has joined #openstack-trove | 10:49 | |
| *** sgotliv has joined #openstack-trove | 10:49 | |
| *** orwell.freenode.net changes topic to "Trove Openstack Database as a Service | Docs https://github.com/openstack/trove | Channel Logs http://eavesdrop.openstack.org/irclogs/ | IRC must read http://sackheads.org/~bnaylor/spew/away_msgs.html" | 10:49 | |
| *** imandhan has joined #openstack-trove | 11:06 | |
| *** tesseract has joined #openstack-trove | 11:33 | |
| -openstackstatus- NOTICE: CI is experiencing issues with test logs, all jobs are currently UNSTABLE as a result. No need to recheck until this is fixed! Thanks for your patience. | 11:43 | |
| *** ChanServ changes topic to "CI is experiencing issues with test logs, all jobs are currently UNSTABLE as a result. No need to recheck until this is fixed! Thanks for your patience." | 11:43 | |
| *** pcaruana has quit IRC | 11:45 | |
| *** imandhan has quit IRC | 11:55 | |
| *** pmackinn has joined #openstack-trove | 12:10 | |
| *** imandhan has joined #openstack-trove | 12:52 | |
| *** ewilson has joined #openstack-trove | 12:58 | |
| *** miqui has joined #openstack-trove | 13:14 | |
| openstackgerrit | Petr Malik proposed openstack/trove: Cleanup guestagent models https://review.openstack.org/278074 | 13:34 |
| *** Guest27231 has quit IRC | 13:45 | |
| *** Guest27231 has joined #openstack-trove | 13:46 | |
| *** Guest27231 is now known as nikhil | 13:48 | |
| *** ChanServ changes topic to "Trove Openstack Database as a Service | Docs https://github.com/openstack/trove | Channel Logs http://eavesdrop.openstack.org/irclogs/ | IRC must read http://sackheads.org/~bnaylor/spew/away_msgs.html" | 14:01 | |
| -openstackstatus- NOTICE: Cleanup from earlier block storage disruption on static.openstack.org has been repaired, and any jobs which reported an "UNSTABLE" result or linked to missing logs between 08:00-14:00 UTC can be retriggered by leaving a "recheck" comment. | 14:02 | |
| *** imandhan has quit IRC | 14:02 | |
| *** links has quit IRC | 14:36 | |
| *** rcernin has quit IRC | 14:46 | |
| *** imandhan has joined #openstack-trove | 14:59 | |
| *** rcernin has joined #openstack-trove | 15:31 | |
| *** rcernin has quit IRC | 15:39 | |
| *** imandhan has quit IRC | 15:54 | |
| *** imandhan has joined #openstack-trove | 16:07 | |
| *** tesseract has quit IRC | 16:19 | |
| openstackgerrit | Petr Malik proposed openstack/trove: Cleanup guestagent models https://review.openstack.org/278074 | 16:29 |
| *** rcernin has joined #openstack-trove | 16:31 | |
| *** grapex has joined #openstack-trove | 16:51 | |
| openstackgerrit | Petr Malik proposed openstack/trove: Cleanup guestagent models https://review.openstack.org/278074 | 17:02 |
| *** twm2016 has joined #openstack-trove | 17:43 | |
| *** khushbu has joined #openstack-trove | 17:57 | |
| *** tqtran has joined #openstack-trove | 18:06 | |
| openstackgerrit | Petr Malik proposed openstack/trove: Cleanup guestagent models https://review.openstack.org/278074 | 18:09 |
| *** ewilson has quit IRC | 18:52 | |
| *** ewilson has joined #openstack-trove | 18:52 | |
| *** mfisch has quit IRC | 19:06 | |
| *** stewie925 has joined #openstack-trove | 19:09 | |
| stewie925 | hi tellesnobrega | 19:09 |
| tellesnobrega | hey stewie925 | 19:10 |
| stewie925 | hey I am currently working on committing a patch for review | 19:10 |
| stewie925 | but I am getting a gerrit error: | 19:10 |
| stewie925 | ! [remote rejected] HEAD -> refs/publish/master/bug/1529622 (you are not allowed to upload merges) | 19:10 |
| stewie925 | error: failed to push some refs to 'https://review.openstack.org/openstack/trove' | 19:10 |
| stewie925 | this was the gerrit patch that I took over from a colleague (there was a merge conflict in it) | 19:11 |
| stewie925 | so yesterday, from our discussion, I git cloned trove to get the latest trove repo, and then applied the changes he made | 19:12 |
| stewie925 | ran the tests successfully... | 19:14 |
| tellesnobrega | hmm, weird. Don't really know what is going on | 19:15 |
| stewie925 | here were your suggestions: pull in another branch (master) the current code from repo , go back to the branch with this code and rebase it against master | 19:16 |
| dougshelley66 | stewie925 did you use the Download..Checkout function in gerrit to setup your local repo with the change | 19:17 |
| *** johnma has quit IRC | 19:17 | |
| stewie925 | hi dougshelley66 | 19:17 |
| dougshelley66 | hi | 19:17 |
| stewie925 | no, I didnt.... | 19:17 |
| dougshelley66 | the easiest way to grab a change from gerrit and work on it | 19:17 |
| dougshelley66 | is to use the "Download...Checkout...copy to clipboard" thing | 19:18 |
| tellesnobrega | stewie925, you applied every change by hand? | 19:18 |
| dougshelley66 | it will put a big git command into your clipboard | 19:18 |
| dougshelley66 | you paste that into a terminal | 19:18 |
| dougshelley66 | on your local | 19:18 |
| dougshelley66 | that will put you on a branch with the changeset | 19:18 |
| dougshelley66 | then to rebase, you do this | 19:19 |
| dougshelley66 | get fetch origin master | 19:19 |
| *** arist has quit IRC | 19:19 | |
| dougshelley66 | sorry "git" | 19:19 |
| dougshelley66 | git rebase FETCH_HEAD | 19:19 |
| *** arist has joined #openstack-trove | 19:19 | |
| dougshelley66 | fix up the conflicts | 19:19 |
| dougshelley66 | git add each file as you fix it | 19:19 |
| dougshelley66 | then when you are done | 19:19 |
| dougshelley66 | git rebase --continue | 19:19 |
| dougshelley66 | then git commit -a --amend to update the commit | 19:20 |
| tellesnobrega | stewie925, dougshelley66 is completely right, that will work for you | 19:20 |
| dougshelley66 | then git review | 19:20 |
| stewie925 | hi tellesnobrega and dougshelley66 - thank you very much | 19:20 |
| tellesnobrega | np | 19:20 |
| dougshelley66 | no prob | 19:20 |
| stewie925 | and tellesnobrega - yes I did update the eight modules manually - let me try this new approach - thanks again! | 19:21 |
| tellesnobrega | cool, give it a try, if you run into problems let us know | 19:21 |
| stewie925 | so at this point - I have a git commit that is "hanging" because of the gerrit issue | 19:21 |
| tellesnobrega | you can git stash to drop the changes | 19:22 |
| stewie925 | unfortunately i ran the git commit amend though... :( | 19:22 |
| tellesnobrega | you could go git log | 19:23 |
| tellesnobrega | get the latest change on the master | 19:23 |
| tellesnobrega | and hard reset your branch to it | 19:23 |
| tellesnobrega | this way it would lose your changes and go back to master version | 19:23 |
| stewie925 | I see- let me go ahead and do the git hard reset | 19:24 |
| stewie925 | git reset --hard HEAD on the branch that I did my last commit | 19:25 |
| dougshelley66 | run git reflog | 19:29 |
| dougshelley66 | and pick the HEAD reference that makes sense for your git reset command | 19:30 |
| openstackgerrit | Ishita Mandhan proposed openstack/trove-dashboard: Add backups table to ng-backups panel https://review.openstack.org/276966 | 19:37 |
| *** grapex has left #openstack-trove | 19:44 | |
| stewie925 | thank you | 19:46 |
| *** amrith is now known as _amrith_ | 19:49 | |
| -openstackstatus- NOTICE: The infrastructure team is taking Gerrit offline for maintenance this afternoon, beginning shortly after 20:00 UTC. We aim to have it back online around 00:00 UTC. | 20:00 | |
| *** _amrith_ is now known as amrith | 20:04 | |
| *** khushbu has quit IRC | 20:06 | |
| -openstackstatus- NOTICE: Gerrit is offline for maintenance until 00:00 UTC | 20:11 | |
| *** ChanServ changes topic to "Gerrit is offline for maintenance until 00:00 UTC" | 20:11 | |
| *** rcernin has quit IRC | 20:15 | |
| stewie925 | just my luck -gerrit is down for maintenance hehe | 20:18 |
| *** grapex has joined #openstack-trove | 20:47 | |
| *** amrith is now known as _amrith_ | 21:15 | |
| *** _amrith_ is now known as amrith | 21:27 | |
| *** ewilson has quit IRC | 22:11 | |
| *** twm2016 has quit IRC | 22:29 | |
| *** grapex has quit IRC | 22:40 | |
| *** stewie925 has quit IRC | 22:52 | |
| *** khushbu_ has joined #openstack-trove | 22:58 | |
| *** stewie925 has joined #openstack-trove | 23:03 | |
| stewie925 | hi dougshelley66 | 23:03 |
| dougshelley66 | hi | 23:03 |
| stewie925 | so i just cloned the trove repo, and then i ran the checkout url of the patch with the merge conflict | 23:03 |
| dougshelley66 | yes | 23:03 |
| dougshelley66 | well not a url | 23:04 |
| stewie925 | sorry i mean a git fetch command not a url :) | 23:04 |
| dougshelley66 | right | 23:04 |
| dougshelley66 | so you should be on detached head | 23:04 |
| stewie925 | yes!!! a detached head | 23:04 |
| dougshelley66 | so that is ok | 23:05 |
| dougshelley66 | normally what i do | 23:05 |
| dougshelley66 | is git checkout -b <topic from gerrit) | 23:05 |
| stewie925 | so do I run both 'git fetch origin/master' and 'git rebase fetch_head' at this point? | 23:05 |
| stewie925 | ohhh ok | 23:05 |
| dougshelley66 | but that isn't required | 23:05 |
| dougshelley66 | so no slash | 23:05 |
| dougshelley66 | git fetch origin master | 23:05 |
| stewie925 | yeah, it ran successfully :) then I run the git rebase FETCH_HEAD (in caps) | 23:07 |
| stewie925 | git rebase FETCH_HEAD | 23:08 |
| dougshelley66 | yes | 23:08 |
| dougshelley66 | did you have conflicts? | 23:08 |
| dougshelley66 | git status will tell you too | 23:08 |
| stewie925 | ahhh now i see conflicts yeah | 23:09 |
| dougshelley66 | so fix them | 23:09 |
| dougshelley66 | make sure all the chevrons are sorted out (<<<< >>>>) | 23:09 |
| dougshelley66 | then do git add on each file | 23:09 |
| dougshelley66 | at that point i would run tox -epep8 and tox -epy27 | 23:09 |
| dougshelley66 | just to be sure | 23:09 |
| dougshelley66 | then git rebase --continue | 23:10 |
| stewie925 | thank you dougshelley66 | 23:10 |
| stewie925 | ok I need to fix the two conflicts (out of 8 modules) | 23:10 |
| dougshelley66 | right that is why the "push button" rebase didnt' work | 23:12 |
| stewie925 | ok I see some '<<<<<' and '>>>>>>' | 23:13 |
| dougshelley66 | yes those are the conflict markers | 23:14 |
| amrith | stewie925, here's something that may help you get some context to all this magic. https://www.youtube.com/watch?v=1ffBJ4sVUb4 | 23:17 |
| amrith | it is a great 45 minute video. | 23:17 |
| amrith | it'll help you understand all this stuff that dougshelley66 is talking about | 23:17 |
| stewie925 | thank you amrith | 23:17 |
| stewie925 | and thank you dougshelley66 ! | 23:17 |
| stewie925 | its a 1 hr 34 min video :D | 23:19 |
| dougshelley66 | np - so if i look at that you have a conflict in cfg.py | 23:19 |
| dougshelley66 | right | 23:19 |
| dougshelley66 | it looks like you need to keep all of the ocde | 23:19 |
| dougshelley66 | code | 23:19 |
| dougshelley66 | default_password_length was added in master and you are trying to add the timeouts | 23:20 |
| dougshelley66 | so just take the chevrons and equal signs out | 23:20 |
| stewie925 | that is right, I need to add the timeouts | 23:20 |
| dougshelley66 | so the conflict is because default_password_length was added in the master | 23:21 |
| dougshelley66 | and it is in the same place as where the timeouts were added | 23:22 |
| dougshelley66 | so you just need to take both | 23:22 |
| *** sgotliv has quit IRC | 23:29 | |
| stewie925 | whew - finally resolved the conflicts | 23:34 |
| stewie925 | :) | 23:34 |
| *** khushbu_ has quit IRC | 23:36 | |
| stewie925 | very interesting though.... after conflicts are fixed, I ran 'git rebase --continue' | 23:37 |
| stewie925 | then I ran git status and no modules are listed | 23:37 |
| dougshelley66 | thats ok | 23:40 |
| dougshelley66 | do git log | 23:40 |
| dougshelley66 | you will see the commit at the top | 23:40 |
| stewie925 | yes! | 23:40 |
| dougshelley66 | so run tox | 23:40 |
| dougshelley66 | tox -epep8 | 23:40 |
| dougshelley66 | tox -epy27 | 23:41 |
| stewie925 | fixing some pep8 structural errors | 23:55 |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!