*** imandhan has joined #openstack-trove | 00:07 | |
*** chlong has quit IRC | 00:24 | |
*** rmevans has joined #openstack-trove | 00:40 | |
*** jinxing has joined #openstack-trove | 00:55 | |
*** cheneydc has joined #openstack-trove | 01:04 | |
*** mingdang1 has joined #openstack-trove | 01:22 | |
*** stewie925_ has quit IRC | 01:28 | |
*** stewie925 has quit IRC | 01:29 | |
*** chlong has joined #openstack-trove | 01:44 | |
*** mingdang1 has quit IRC | 02:16 | |
*** haomaiwang has joined #openstack-trove | 02:23 | |
*** _amrith_ is now known as amrith | 02:53 | |
*** chlong has quit IRC | 03:13 | |
openstackgerrit | ZhiQiang Fan proposed openstack/trove: [Trivial] Remove unnecessary executable flag for files https://review.openstack.org/310982 | 03:13 |
---|---|---|
*** rmevans has quit IRC | 03:25 | |
*** _imandhan_ has joined #openstack-trove | 03:31 | |
*** imandhan has quit IRC | 03:35 | |
*** chlong has joined #openstack-trove | 03:36 | |
*** imandhan has joined #openstack-trove | 03:46 | |
*** _imandhan_ has quit IRC | 03:49 | |
*** imandhan has quit IRC | 05:00 | |
*** imandhan has joined #openstack-trove | 05:24 | |
*** imandhan has quit IRC | 05:29 | |
*** cguadall_ has joined #openstack-trove | 05:45 | |
*** cguadall has quit IRC | 05:47 | |
openstackgerrit | Sean McCully proposed openstack/trove: Schema migrations fail for postgresql backend https://review.openstack.org/311032 | 05:48 |
openstackgerrit | OpenStack Proposal Bot proposed openstack/trove-dashboard: Imported Translations from Zanata https://review.openstack.org/309654 | 06:16 |
*** cheneydc has quit IRC | 06:33 | |
*** rcernin has joined #openstack-trove | 06:36 | |
*** cheneydc has joined #openstack-trove | 06:50 | |
*** amrith is now known as _amrith_ | 07:02 | |
*** _amrith_ is now known as amrith | 07:05 | |
*** kong has quit IRC | 07:19 | |
*** chlong has quit IRC | 07:21 | |
*** mingdang1 has joined #openstack-trove | 08:00 | |
*** dmk0202 has joined #openstack-trove | 08:22 | |
*** cheneydc1 has joined #openstack-trove | 08:40 | |
*** jinxing has quit IRC | 08:42 | |
*** cheneydc has quit IRC | 08:44 | |
*** cheneydc1 has quit IRC | 08:44 | |
*** cheneydc has joined #openstack-trove | 08:46 | |
*** jinxing has joined #openstack-trove | 08:47 | |
*** cheneydc has quit IRC | 08:50 | |
*** cheneydc has joined #openstack-trove | 08:51 | |
*** cheneydc has quit IRC | 09:21 | |
*** cheneydc has joined #openstack-trove | 09:21 | |
*** cheneydc has quit IRC | 09:26 | |
*** dkehn has quit IRC | 09:30 | |
*** cheneydc has joined #openstack-trove | 09:36 | |
*** jinxing has quit IRC | 09:41 | |
*** mingdang1 has quit IRC | 09:43 | |
*** cheneydc has quit IRC | 09:46 | |
*** tosky has joined #openstack-trove | 09:46 | |
*** jinxing has joined #openstack-trove | 09:46 | |
*** cheneydc has joined #openstack-trove | 09:54 | |
*** cheneydc has quit IRC | 09:59 | |
*** haomaiwang has quit IRC | 10:30 | |
*** haomaiwang has joined #openstack-trove | 10:35 | |
*** haomaiwang has quit IRC | 10:36 | |
*** jinxing has quit IRC | 10:46 | |
*** mingdang1 has joined #openstack-trove | 10:59 | |
*** amrith is now known as _amrith_ | 11:45 | |
*** tesseract has joined #openstack-trove | 12:34 | |
*** tesseract is now known as Guest51376 | 12:34 | |
*** _amrith_ is now known as amrith | 12:56 | |
*** arist has quit IRC | 13:14 | |
*** arist has joined #openstack-trove | 13:14 | |
*** miqui has joined #openstack-trove | 13:29 | |
*** mingdang1 has quit IRC | 13:45 | |
*** ewilson has joined #openstack-trove | 13:59 | |
*** ewilson has quit IRC | 14:00 | |
amrith | https://etherpad.openstack.org/p/trove-newton-summit-contributor-meetup | 14:15 |
*** ewilson has joined #openstack-trove | 14:15 | |
*** barclaac has left #openstack-trove | 14:16 | |
*** pmackinn has joined #openstack-trove | 14:23 | |
*** david-lyle has joined #openstack-trove | 14:27 | |
*** alejandrito has joined #openstack-trove | 14:29 | |
*** SlickNik has quit IRC | 14:33 | |
*** dalees has quit IRC | 14:33 | |
*** SlickNik has joined #openstack-trove | 14:37 | |
*** dalees has joined #openstack-trove | 14:37 | |
amrith | spec: https://review.openstack.org/#/c/298994/ | 14:38 |
amrith | code: https://review.openstack.org/#/c/301936/ | 14:38 |
amrith | code: https://review.openstack.org/#/c/301342/ | 14:38 |
amrith | code: https://review.openstack.org/#/c/301342/ | 14:38 |
amrith | code: https://review.openstack.org/#/c/301342/ | 14:38 |
*** cdelatte has joined #openstack-trove | 14:39 | |
*** ewilson has quit IRC | 14:57 | |
*** stewie925 has joined #openstack-trove | 14:59 | |
*** ewilson has joined #openstack-trove | 15:00 | |
stewie925 | hello tosky | 15:03 |
tosky | stewie925: hi | 15:04 |
stewie925 | hello all - I have a question for git branch - is it possible to work on two branches at the same time - or should we commit the first branch before working on the next branch? | 15:05 |
stewie925 | oh hey :) | 15:05 |
stewie925 | so I was able to do what you suggested :) created a branch for bug1 then create branch for bug2 from origin/master | 15:06 |
tosky | you can't work on two branches at the same time; you switch between them when needed | 15:06 |
tosky | only one is active | 15:06 |
tosky | but you can have tons of branches and switch when needed | 15:07 |
stewie925 | yeah thats actually my next question - how do you switch around? I believe it is checkout | 15:07 |
stewie925 | git checkout <branch> | 15:07 |
tosky | so when you want to switch, you will probably want to commit (locally) your changes, but you can always modify them (before they are pushed to a remote branch) | 15:07 |
stewie925 | ohhh commit - thats what I missed then... | 15:08 |
stewie925 | cause when i made changes to <bug2>, I didnt commit - then i switch to t branch <bug2> and I see that the change in <bug2> was copied to <bug1> | 15:09 |
tosky | it was not copied; the changes simply stayed there, in your working copy | 15:09 |
tosky | and git allowed you to switch because the changes did not conflict with the changes in the new branch | 15:09 |
*** Guest51376 has quit IRC | 15:10 | |
stewie925 | hmmm... | 15:11 |
stewie925 | well here is what happened - so I changed and saved a file called 'README' in <bug2> then i switched over to <bug1> by typing $ git checkout <bug1> | 15:14 |
stewie925 | the first line that came out shows "M README" | 15:14 |
stewie925 | I saw this website http://www.gitguys.com/topics/switching-branches-without-committing/ -> it says "M README" indicates that the README file has been merged into <bug1> branch | 15:16 |
stewie925 | i was hoping that the README in <bug1> remained untouched | 15:17 |
tosky | you only modified your working copy, you never changed it in the branch | 15:18 |
tosky | you change the code in a branch only when you commit it | 15:18 |
stewie925 | so tosky, whats that "M README" mean then? cause I am seeing that when switching to another branch | 15:19 |
tosky | stewie925: the file is modified; check with git status | 15:19 |
tosky | it is modified in your local copy | 15:19 |
tosky | it will continue to be in that status until you commit it, or you restore it to the previous state | 15:20 |
*** cdelatte has quit IRC | 15:24 | |
stewie925 | I see.... so I should do the commit in one branch before switching to another | 15:26 |
stewie925 | thank you again, tosky! | 15:27 |
tosky | or stash the change (look for git stash) | 15:28 |
stewie925 | yeah, I'll research 'git stash' as well | 15:30 |
*** ewilson has quit IRC | 15:31 | |
*** pmackinn has quit IRC | 15:33 | |
*** ewilson has joined #openstack-trove | 15:42 | |
amrith | http://docs-draft.openstack.org/23/311123/2/check/gate-releases-docs/7e93f21//doc/build/html/newton/index.html | 15:43 |
amrith | http://docs-draft.openstack.org/23/311123/2/check/gate-releases-docs/7e93f21//doc/build/html/newton/schedule.html | 15:43 |
*** cdelatte has joined #openstack-trove | 15:46 | |
*** cdelatte has quit IRC | 15:50 | |
*** cdelatte has joined #openstack-trove | 15:53 | |
*** pmackinn has joined #openstack-trove | 15:55 | |
*** tellesnobrega_af is now known as tellesnobrega | 16:00 | |
dougshelley66 | https://review.openstack.org/#/c/259167/ | 16:03 |
*** royoung has joined #openstack-trove | 16:06 | |
*** cdelatte has quit IRC | 16:11 | |
*** dmk0202 has quit IRC | 16:12 | |
*** pmackinn has quit IRC | 16:21 | |
stewie925 | tosky: that 'git stash' is heaven sent | 16:24 |
*** rcernin has quit IRC | 16:26 | |
*** mingdang1 has joined #openstack-trove | 16:46 | |
*** raginbajin has quit IRC | 16:50 | |
*** mingdang1 has quit IRC | 16:51 | |
*** raginbaji has joined #openstack-trove | 16:54 | |
amrith | https://docs.google.com/document/d/1Dy60W0zTkGUEhBOmapXGXFBVtggbm6UGYIxsIdaRbzw/edit?usp=sharing | 17:03 |
*** david-lyle has quit IRC | 17:24 | |
*** tosky has quit IRC | 17:26 | |
*** royoung has quit IRC | 17:26 | |
*** ewilson has quit IRC | 17:30 | |
*** amrith is now known as _amrith_ | 17:40 | |
*** tellesnobrega is now known as tellesnobrega_af | 17:44 | |
*** tellesnobrega_af is now known as tellesnobrega | 18:10 | |
*** ewilson has joined #openstack-trove | 18:14 | |
*** royoung has joined #openstack-trove | 18:15 | |
*** alejandrito has quit IRC | 18:19 | |
*** ewilson has quit IRC | 18:20 | |
*** ewilson has joined #openstack-trove | 18:22 | |
*** ewilson has quit IRC | 18:25 | |
*** alejandrito has joined #openstack-trove | 18:32 | |
*** stewie925 has quit IRC | 18:35 | |
*** alejandrito has quit IRC | 18:47 | |
*** alejandrito has joined #openstack-trove | 18:49 | |
*** david-lyle has joined #openstack-trove | 19:09 | |
openstackgerrit | Petr Malik proposed openstack/trove: Remove unused 'override.config.template' https://review.openstack.org/310549 | 19:17 |
*** tellesnobrega is now known as tellesnobrega_af | 19:22 | |
*** miqui has quit IRC | 19:22 | |
*** tellesnobrega_af is now known as tellesnobrega | 19:27 | |
*** davideagnello has joined #openstack-trove | 19:29 | |
*** davideagnello has quit IRC | 19:30 | |
*** pmackinn has joined #openstack-trove | 19:34 | |
openstackgerrit | Petr Malik proposed openstack/trove: Deprecate 'guest_log_long_query_time' https://review.openstack.org/311237 | 19:44 |
*** cdelatte has joined #openstack-trove | 19:53 | |
*** tellesnobrega is now known as tellesnobrega_af | 20:01 | |
*** tellesnobrega_af is now known as tellesnobrega | 20:02 | |
*** cdelatte has quit IRC | 20:12 | |
*** cdelatte has joined #openstack-trove | 20:13 | |
*** cdelatte has quit IRC | 20:13 | |
*** pmackinn has quit IRC | 20:23 | |
*** haypo has left #openstack-trove | 20:31 | |
*** _amrith_ is now known as amrith | 20:38 | |
*** stewie925 has joined #openstack-trove | 21:05 | |
stewie925 | peterstac: hello | 21:07 |
stewie925 | hello all, I committed a trove fix a few days ago - core reviewer replied in gerrit with a question addressed to vertica | 21:11 |
amrith | what's the review # | 21:11 |
stewie925 | being kinda new to gerrit myself, I am wondering if the vertica folks do receive the email of my gerrit commit as well? | 21:11 |
stewie925 | hi amrith | 21:12 |
stewie925 | it is https://review.openstack.org/#/c/308693/ | 21:12 |
amrith | ok, I looked at it. no, the vertica folks will likely not have received this email. peterstac what do you suggest? | 21:13 |
stewie925 | i understand most of them may be at the openstack summit this week | 21:13 |
stewie925 | thank you amrith and peterstac for your help in advance | 21:14 |
*** amrith is now known as _amrith_ | 21:56 | |
*** _amrith_ is now known as amrith | 21:57 | |
stewie925 | hey guys , when you do 'git stash' on a file you just changed within a branch, does that file become 'invisible'? cause I tried to do an 'ls' command and it couldnt find the file | 22:03 |
*** stevemar has joined #openstack-trove | 22:05 | |
stewie925 | I see the file is 'stashed' away, its not gone , but wondering why the file is not being displayed when I do an 'ls' command | 22:09 |
*** amrith is now known as _amrith_ | 22:15 | |
stewie925 | nm guys, I got my 'git stash' resolved | 22:27 |
openstackgerrit | OpenStack Proposal Bot proposed openstack/python-troveclient: Updated from global requirements https://review.openstack.org/311350 | 22:41 |
openstackgerrit | OpenStack Proposal Bot proposed openstack/trove: Updated from global requirements https://review.openstack.org/311358 | 22:42 |
*** david-lyle has quit IRC | 22:45 | |
openstackgerrit | OpenStack Proposal Bot proposed openstack/python-troveclient: Updated from global requirements https://review.openstack.org/311413 | 22:49 |
openstackgerrit | OpenStack Proposal Bot proposed openstack/trove: Updated from global requirements https://review.openstack.org/311416 | 22:50 |
*** royoung has left #openstack-trove | 22:53 | |
*** stewie925 has quit IRC | 22:54 | |
*** tellesnobrega is now known as tellesnobrega_af | 23:02 | |
*** alejandrito has quit IRC | 23:02 | |
openstackgerrit | OpenStack Proposal Bot proposed openstack/trove: Updated from global requirements https://review.openstack.org/311358 | 23:09 |
openstackgerrit | OpenStack Proposal Bot proposed openstack/trove: Updated from global requirements https://review.openstack.org/311416 | 23:17 |
*** mingdang1 has joined #openstack-trove | 23:30 | |
*** ozialien10 has joined #openstack-trove | 23:43 |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!