openstackgerrit | Merged openstack/python-troveclient: configuration-* cli allow name of configuration group entered https://review.openstack.org/233998 | 00:03 |
---|---|---|
*** rmevans has joined #openstack-trove | 00:26 | |
openstackgerrit | STEW TY proposed openstack/trove-integration: change vertica config parameter https://review.openstack.org/310624 | 00:35 |
pmalik | stewie925 Hi. This is what the 'Depends-On' tag is for. In your case the 'trove-integration' change depends on the 'trove' change. You put 'Depends-On: I22040085a24de1d0e5fd3132802aca684387477d' to the commit message on you 'trove-integration' patch set (the ID is the Change-Id of other patch set). P. | 00:39 |
stewie925 | hey pmalik | 00:40 |
stewie925 | this is the gerrit review for the trove-integration fix -> https://review.openstack.org/310624 | 00:40 |
stewie925 | so I need to do a git commit amend to add the depends-On line that you suggested? | 00:41 |
stewie925 | I am also wondering why the reviewers list is empty there - normally gerrit knows to generate reviewers | 00:41 |
stewie925 | maybe you could assist in shedding light on why the reviewers list is empty | 00:42 |
pmalik | stewie925 See for instance this: https://review.openstack.org/#/c/286317/ The change depends on two other patch sets (one from trove-integration repo and one from requirements repo) | 00:42 |
stewie925 | oh thank you for sharing that gerrit link with the 'depends-on' | 00:43 |
pmalik | stewie925 I think the reviewers appear only when somebody reviews (+/-) the change. | 00:43 |
stewie925 | but am still wondering if the missing reviewers list should be a cause for concern - or do I just 'manually' add the reviewers? | 00:44 |
stewie925 | I see - but I am at least expecting Jenkins (testing) automatically added as a reviewer, right? | 00:44 |
stewie925 | i'll go ahead and add the dependsOn - hopefully it will trigger gerrit to assign the reviewers :) | 00:45 |
stewie925 | brb | 00:45 |
openstackgerrit | STEW TY proposed openstack/trove-integration: change vertica config parameter https://review.openstack.org/310624 | 00:48 |
*** rmevans has quit IRC | 00:49 | |
stewie925 | updated gerrit with depends-on | 00:49 |
stewie925 | thank you pmalik! | 00:49 |
*** cheneydc has joined #openstack-trove | 00:55 | |
*** jinxing has joined #openstack-trove | 01:03 | |
*** stewie925 has quit IRC | 01:13 | |
*** stevemar has joined #openstack-trove | 01:38 | |
*** haomaiwang has joined #openstack-trove | 02:13 | |
*** mingdang1 has joined #openstack-trove | 02:13 | |
*** tqtran has joined #openstack-trove | 02:50 | |
*** tqtran has quit IRC | 02:50 | |
*** rmevans has joined #openstack-trove | 03:12 | |
*** mingdang1 has quit IRC | 05:09 | |
*** rmevans has quit IRC | 05:20 | |
*** jinxing has quit IRC | 05:26 | |
*** jinxing has joined #openstack-trove | 05:38 | |
*** jinxing has quit IRC | 05:52 | |
*** stevemar has quit IRC | 05:52 | |
*** jinxing has joined #openstack-trove | 05:54 | |
*** cheneydc has quit IRC | 06:09 | |
openstackgerrit | OpenStack Proposal Bot proposed openstack/trove-dashboard: Imported Translations from Zanata https://review.openstack.org/309654 | 06:16 |
*** haomaiwang has quit IRC | 06:20 | |
*** cheneydc has joined #openstack-trove | 06:23 | |
*** mingdang1 has joined #openstack-trove | 06:29 | |
*** mugsie has quit IRC | 07:19 | |
*** jinxing has quit IRC | 07:40 | |
*** flwang has quit IRC | 07:41 | |
*** jinxing has joined #openstack-trove | 07:48 | |
*** flwang has joined #openstack-trove | 07:52 | |
*** dmk0202 has joined #openstack-trove | 08:10 | |
*** mingdang1 has quit IRC | 09:04 | |
*** mingdang1 has joined #openstack-trove | 09:10 | |
*** jinxing has quit IRC | 09:34 | |
*** jinxing has joined #openstack-trove | 09:39 | |
*** rcernin has joined #openstack-trove | 09:44 | |
*** tosky has joined #openstack-trove | 09:46 | |
*** cheneydc has quit IRC | 09:59 | |
*** jinxing has quit IRC | 10:04 | |
*** jinxing has joined #openstack-trove | 10:13 | |
*** tosky has quit IRC | 10:24 | |
*** tosky has joined #openstack-trove | 10:33 | |
*** tosky has quit IRC | 11:05 | |
*** haomaiwang has joined #openstack-trove | 11:09 | |
*** haomaiwang has quit IRC | 11:14 | |
*** jinxing has quit IRC | 11:26 | |
*** jinxing has joined #openstack-trove | 11:33 | |
*** jinxing has quit IRC | 11:37 | |
*** tosky has joined #openstack-trove | 11:43 | |
*** haypo has joined #openstack-trove | 11:50 | |
haypo | hi. it looks like you are busy with the summit ;) just in case, there are Python 3 patches which already got a first +2 and are waiting for your review (or even approval!): https://review.openstack.org/#/q/status:open+project:openstack/trove+branch:master+topic:bp/trove-python3 | 11:53 |
haypo | _amrith_: did you talk about Python 3 at the summit yet? | 11:54 |
*** cheneydc has joined #openstack-trove | 12:26 | |
*** cheneydc has quit IRC | 12:26 | |
*** cguadall has joined #openstack-trove | 12:41 | |
*** cguadall_ has quit IRC | 12:44 | |
*** haomaiwang has joined #openstack-trove | 12:58 | |
*** haomaiwang has quit IRC | 13:02 | |
*** arist has quit IRC | 13:13 | |
*** arist has joined #openstack-trove | 13:14 | |
*** _amrith_ is now known as amrith | 13:26 | |
amrith | haypo, yes we did | 13:27 |
amrith | done yesterday | 13:27 |
haypo | amrith: nice. any feedback? how is the summit going? | 13:29 |
amrith | haypo, summit is going well | 13:29 |
amrith | we decided to make the py34 changes a voting gate | 13:29 |
amrith | I'm pushing the change up for that right now | 13:29 |
haypo | "we decided to make the py34 changes a voting gate" ah? it was already decided one week ago on the IRC meeting no? my change is already merged, the gate is voting | 13:30 |
amrith | did it? | 13:30 |
amrith | sure did | 13:31 |
amrith | cool | 13:31 |
amrith | just looked at a recent build and py34 is voting | 13:31 |
amrith | so we decided it again :) | 13:31 |
amrith | good thing we came to the same conclusion ... | 13:31 |
amrith | other than that, nothing specific to the python3 project | 13:31 |
*** amrith is now known as _amrith_ | 13:42 | |
*** jinxing has joined #openstack-trove | 13:55 | |
*** _amrith_ is now known as amrith | 13:58 | |
*** miqui has joined #openstack-trove | 14:11 | |
*** david-lyle has joined #openstack-trove | 14:11 | |
*** mingdang1 has quit IRC | 14:13 | |
*** miqui|2 has joined #openstack-trove | 14:16 | |
*** miqui has quit IRC | 14:16 | |
*** miqui has joined #openstack-trove | 14:24 | |
*** miqui|2 has quit IRC | 14:24 | |
*** miqui|2 has joined #openstack-trove | 14:28 | |
*** miqui has quit IRC | 14:29 | |
*** miqui has joined #openstack-trove | 14:32 | |
*** miqui|2 has quit IRC | 14:33 | |
*** david-lyle has quit IRC | 14:35 | |
*** david-lyle has joined #openstack-trove | 14:36 | |
*** amrith is now known as _amrith_ | 14:39 | |
*** miqui|2 has joined #openstack-trove | 14:40 | |
*** miqui has quit IRC | 14:40 | |
*** miqui|2 has quit IRC | 14:41 | |
*** david-lyle has quit IRC | 14:41 | |
*** miqui has joined #openstack-trove | 14:41 | |
*** david-lyle has joined #openstack-trove | 14:49 | |
*** _amrith_ is now known as amrith | 14:52 | |
*** pmackinn has joined #openstack-trove | 14:55 | |
*** dmk0202 has quit IRC | 15:06 | |
*** khushbu_ has joined #openstack-trove | 15:14 | |
*** khushbu_ has quit IRC | 15:25 | |
*** david-lyle has quit IRC | 15:31 | |
*** amrith is now known as _amrith_ | 15:37 | |
*** imandhan has joined #openstack-trove | 15:43 | |
*** _amrith_ is now known as amrith | 15:56 | |
*** david-lyle has joined #openstack-trove | 16:00 | |
*** imandhan has quit IRC | 16:12 | |
*** haomaiwang has joined #openstack-trove | 16:17 | |
*** imandhan has joined #openstack-trove | 16:30 | |
*** imandhan has quit IRC | 16:42 | |
*** pmackinn has quit IRC | 16:44 | |
*** david-lyle has quit IRC | 16:46 | |
*** pmackinn has joined #openstack-trove | 16:49 | |
*** imandhan has joined #openstack-trove | 16:50 | |
*** amrith is now known as _amrith_ | 16:51 | |
*** _amrith_ is now known as amrith | 16:51 | |
*** ewilson has joined #openstack-trove | 16:57 | |
*** haomaiwang has quit IRC | 17:10 | |
*** haomaiwang has joined #openstack-trove | 17:12 | |
*** ewilson has quit IRC | 17:13 | |
*** mingdang1 has joined #openstack-trove | 17:14 | |
*** ewilson has joined #openstack-trove | 17:14 | |
*** haomaiwang has quit IRC | 17:17 | |
*** ewilson has quit IRC | 17:18 | |
*** mingdang1 has quit IRC | 17:18 | |
*** stewie925 has joined #openstack-trove | 17:19 | |
stewie925 | hello all | 17:19 |
stewie925 | I have a question about git branching | 17:19 |
stewie925 | I just finished working on a trove bug (awaiting merge) and took on a new bug which turns out to be another trove bug | 17:19 |
stewie925 | so I want to separate the bug2 fix with the bug1 fix -> I understand that's where the usefulness of 'git branch' comes in | 17:20 |
stewie925 | so I am creating a new branch called bug2 - question is how do I commit this bug2 fix 'separate' from the bug1 fix | 17:22 |
*** ewilson has joined #openstack-trove | 17:22 | |
*** imandhan has quit IRC | 17:23 | |
stewie925 | I didnt create a branch for bug1 fix, so changes for bug1 are in branch master | 17:24 |
stewie925 | will git be able to treat 'branch-bug2' as separate from 'branch-master' , and thus I can do a new commit for branch-bug2 (i.e., Closes-Bug: #<bug2> and a new change-id assigned to this)? | 17:27 |
tosky | stewie925: this is not about git, but about gerrit | 17:28 |
tosky | gerrit works with individual patches, that are than merged into the target branch | 17:28 |
stewie925 | hi tosky, thanks for the correction - yes gerrit not git | 17:28 |
tosky | so when you submit a review, you push all the changes from the current version of the branch you changed | 17:29 |
tosky | if you create a branch for bug2 now, it will be on top of the changes for bug1 | 17:30 |
stewie925 | so <branch-bug2> will contain the changes that i made for bug1 , is that right? | 17:31 |
tosky | so if you execute git review from bug2, it will ask you to submit two patches | 17:31 |
tosky | yes, you can easily check it with a graphical tool like qgit, for example, or git log --graph | 17:31 |
tosky | git review will send the two patches to gerrit, which needs to be merged in the right order | 17:32 |
tosky | if you want to submit two independent patches, you need to create two branches on top of master | 17:32 |
tosky | you can do it even now; from your modified master, create a branch for bug1 | 17:32 |
*** ewilson has quit IRC | 17:32 | |
stewie925 | ohhhh now I understand - thats a good idea tosky | 17:33 |
tosky | but then your master will be still your modified one | 17:33 |
stewie925 | I should make it a habit of creating branches from now on - just started doing bug fixes a couple weeks ago | 17:33 |
tosky | then you can reset it (git reset --hard origin/master - please backup your changes before doing it, not responsible for data loss :) | 17:34 |
tosky | and remember that you can create a branch based on the origin version of master even now | 17:34 |
stewie925 | exactly.... | 17:34 |
stewie925 | just to clarify... | 17:34 |
tosky | if you see the documentation of git branch, something like `git branch mynewbranch origin/master` will create mynewbranch on top of origin/master | 17:35 |
*** pmackinn has quit IRC | 17:35 | |
stewie925 | so if i had created branch-bug1 right after git cloning, then I created branch-bug2 for the second bug fix, then these two branches would have been INDEPENDENT of each other | 17:35 |
tosky | yes | 17:36 |
tosky | again, git log --graph and/or qgit or gitk shows the image better than how I can describe it :) | 17:36 |
tosky | if you see the documentation of git branch, something like `git branch mynewbranch origin/master` will create mynewbranch on top of origin/master | 17:36 |
tosky | just for the record | 17:36 |
stewie925 | thank you so much for your explanation, tosky | 17:37 |
stewie925 | next time I will always create a branch for any future fix | 17:37 |
tosky | stewie925: a good git reference (open source book, available also in printed version) is https://git-scm.com/book/en/v2 | 17:37 |
* stewie925 clicks on the link | 17:38 | |
* stewie925 thanks tosky profusely for this helpful tip | 17:39 | |
tosky | well, for the logs, not totally "open source" as it is CC-BY-NC-ND, but still, a really good resource that can be easily used | 17:39 |
stewie925 | :) | 17:40 |
*** amrith is now known as _amrith_ | 17:43 | |
*** rcernin has quit IRC | 17:43 | |
*** alejandrito has joined #openstack-trove | 18:00 | |
*** alejandrito_ has joined #openstack-trove | 18:03 | |
*** alejandrito__ has joined #openstack-trove | 18:04 | |
*** tosky has quit IRC | 18:06 | |
*** stewie925 has quit IRC | 18:06 | |
*** stewie925 has joined #openstack-trove | 18:08 | |
*** rcernin has joined #openstack-trove | 18:17 | |
*** alejandrito_ has quit IRC | 18:19 | |
*** alejandrito has quit IRC | 18:19 | |
*** alejandrito__ has quit IRC | 18:19 | |
*** _amrith_ is now known as amrith | 18:19 | |
*** alejandrito has joined #openstack-trove | 18:20 | |
*** david-lyle has joined #openstack-trove | 18:24 | |
*** ewilson has joined #openstack-trove | 18:27 | |
stewie925 | test | 18:34 |
*** pmackinn has joined #openstack-trove | 18:36 | |
*** elmiko has left #openstack-trove | 18:49 | |
*** rcernin has quit IRC | 18:50 | |
stewie925 | hi tosky | 18:53 |
stewie925 | when doing the 'git reset --hard origin/master' it doesnt really matter which branch you are in, correct? | 18:53 |
stewie925 | and doing the above command will bring me back to the original state of the master branch - i.e., the initial git clone state | 18:54 |
stewie925 | correction - doing the above command will bring 'the master branch' back to the original state - i.e., the initial git clone state | 18:56 |
*** barclaac has quit IRC | 19:07 | |
*** barclaac has joined #openstack-trove | 19:11 | |
*** pmackinn has quit IRC | 19:13 | |
*** pmackinn has joined #openstack-trove | 19:15 | |
*** david-lyle has quit IRC | 19:15 | |
*** ewilson has quit IRC | 19:18 | |
*** ewilson has joined #openstack-trove | 19:19 | |
dougshelley66 | https://docs.google.com/presentation/d/1z8OF8QSX_q151_sV3B0CNoRuy_55DAHkI1c04CpssWk/edit#slide=id.g10f0a5a2fa_0_0 | 19:22 |
pmackinn | https://docs.google.com/presentation/d/1z8OF8QSX_q151_sV3B0CNoRuy_55DAHkI1c04CpssWk/present#slide=id.p4 | 19:22 |
*** rcernin has joined #openstack-trove | 19:39 | |
*** stewie925 has quit IRC | 19:59 | |
*** ewilson has quit IRC | 20:05 | |
*** pmackinn has quit IRC | 20:06 | |
*** stewie925 has joined #openstack-trove | 20:09 | |
stewie925 | hi amrith | 20:20 |
stewie925 | I have a question with https://bugs.launchpad.net/trove/+bug/1544522 | 20:20 |
openstack | Launchpad bug 1544522 in OpenStack DBaaS (Trove) "Don't use Mock.called_once_with that does not exist" [Undecided,Confirmed] - Assigned to STEW TY (stewie925) | 20:21 |
*** ewilson has joined #openstack-trove | 20:27 | |
amrith | stewie925, post the question here I'll get to it ... may not be able to answer in real time | 20:33 |
*** stewie925 has quit IRC | 20:47 | |
*** stewie925 has joined #openstack-trove | 20:51 | |
*** amrith is now known as _amrith_ | 20:55 | |
*** _amrith_ is now known as amrith | 21:08 | |
*** david-lyle has joined #openstack-trove | 21:12 | |
stewie925 | sorry amrith I got disconnected ... regarding bug/1544522 - do I simply find the ".called_once_with" and replace them with ".assert_called_once_with" ? | 21:18 |
openstackgerrit | Doug Shelley proposed openstack/trove: Postgresql Streaming Replication https://review.openstack.org/288712 | 21:30 |
*** miqui has quit IRC | 21:32 | |
*** alejandrito has quit IRC | 21:34 | |
amrith | stewie925, this bug has been fixed in a number of other projects so I suggest you see what was done there. | 21:34 |
stewie925 | hi amrith, thanks.... after I asked the question I did see that a fix was made on trove but abandoned... | 21:35 |
stewie925 | https://review.openstack.org/#/c/281232/2 | 21:36 |
*** ewilson has quit IRC | 21:41 | |
openstackgerrit | Doug Shelley proposed openstack/trove: Postgresql Incremental Backup and Restore https://review.openstack.org/259167 | 21:43 |
stewie925 | hello peterstac | 21:52 |
*** rcernin has quit IRC | 21:53 | |
*** amrith is now known as _amrith_ | 21:55 | |
*** _amrith_ is now known as amrith | 21:59 | |
*** amit213 has quit IRC | 22:37 | |
*** amit213 has joined #openstack-trove | 22:38 | |
*** stewie925 has quit IRC | 22:40 | |
*** amrith is now known as _amrith_ | 22:48 | |
*** david-lyle has quit IRC | 22:50 | |
*** stewie925_ has joined #openstack-trove | 22:56 | |
stewie925_ | hello guys I have a question on git branch | 23:03 |
stewie925_ | I created multiple branches - each to contain only specific changes for a bug (branch-1 for bug1, branch-2 for bug2...) | 23:04 |
stewie925_ | so I made a change on branch-2 for bug2 | 23:04 |
stewie925_ | but when I tried to switch over to branch-1 - I see that the changes i made on branch-2 now shows up on branch-1 | 23:05 |
stewie925_ | turns out it was due to 'git checkout' that I did - how do I undo? | 23:05 |
*** stewie925 has joined #openstack-trove | 23:23 | |
*** jinxing has quit IRC | 23:27 |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!