| *** bknudson has quit IRC | 00:00 | |
| *** ved_lad has quit IRC | 00:14 | |
| openstackgerrit | A change was merged to openstack/security-doc: Fix Networking title https://review.openstack.org/107159 | 00:20 |
|---|---|---|
| *** tmcpeak has joined #openstack-security | 00:45 | |
| *** tmcpeak has quit IRC | 00:47 | |
| *** shohel02 has joined #openstack-security | 01:08 | |
| *** sicarie_ has joined #openstack-security | 01:24 | |
| *** sicarie_ has quit IRC | 01:34 | |
| *** bdpayne has joined #openstack-security | 01:36 | |
| *** shohel02 has quit IRC | 01:36 | |
| *** shohel02 has joined #openstack-security | 01:37 | |
| *** shohel02 has quit IRC | 01:42 | |
| *** shohel02 has joined #openstack-security | 02:07 | |
| *** shohel02 has quit IRC | 02:09 | |
| *** shohel02_ has joined #openstack-security | 02:09 | |
| *** shohel02_ has quit IRC | 02:13 | |
| *** shohel02 has joined #openstack-security | 02:18 | |
| *** Cirilo has joined #openstack-security | 02:21 | |
| *** Cirilo has left #openstack-security | 02:23 | |
| *** shohel02 has quit IRC | 02:23 | |
| *** bdpayne has quit IRC | 03:07 | |
| *** shohel02 has joined #openstack-security | 03:18 | |
| *** shohel02 has quit IRC | 03:23 | |
| openstackgerrit | liusheng proposed a change to openstack/security-doc: Correct a awkward phrase of Security Guide https://review.openstack.org/107881 | 03:44 |
| *** shohel02 has joined #openstack-security | 04:18 | |
| *** shohel02 has quit IRC | 04:23 | |
| *** bdpayne has joined #openstack-security | 05:00 | |
| *** shohel02 has joined #openstack-security | 05:18 | |
| openstackgerrit | Sriram Subramanian proposed a change to openstack/security-doc: Clarify usage of SWAuth https://review.openstack.org/107847 | 05:20 |
| *** shohel02 has quit IRC | 05:23 | |
| *** shohel02 has joined #openstack-security | 05:46 | |
| openstackgerrit | OpenStack Proposal Bot proposed a change to openstack/security-doc: Imported Translations from Transifex https://review.openstack.org/107903 | 06:05 |
| *** elo has quit IRC | 06:30 | |
| *** shohel02 has quit IRC | 07:04 | |
| *** shohel02 has joined #openstack-security | 07:04 | |
| *** shohel02_ has joined #openstack-security | 07:14 | |
| *** shohel02 has quit IRC | 07:14 | |
| *** shohel02_ has quit IRC | 07:27 | |
| *** shohel02 has joined #openstack-security | 07:28 | |
| *** shohel02 has quit IRC | 07:32 | |
| *** shohel02 has joined #openstack-security | 07:36 | |
| *** elo has joined #openstack-security | 07:52 | |
| *** shohel02 has quit IRC | 08:08 | |
| *** shohel02 has joined #openstack-security | 08:09 | |
| *** shohel02 has quit IRC | 08:13 | |
| openstackgerrit | zhangtralon proposed a change to openstack/security-doc: make the last paragraph more intelligible https://review.openstack.org/107928 | 08:34 |
| *** bdpayne has quit IRC | 08:44 | |
| *** shohel02 has joined #openstack-security | 08:49 | |
| *** shohel02 has quit IRC | 08:54 | |
| openstackgerrit | zhangtralon proposed a change to openstack/security-doc: last section in Service Authorization is confusing https://review.openstack.org/107928 | 09:01 |
| *** shohel02 has joined #openstack-security | 09:48 | |
| *** shohel02 has quit IRC | 09:53 | |
| openstackgerrit | A change was merged to openstack/security-doc: Imported Translations from Transifex https://review.openstack.org/107903 | 09:57 |
| openstackgerrit | A change was merged to openstack/security-doc: Fix Grammatical Error https://review.openstack.org/107850 | 10:48 |
| *** shohel02 has joined #openstack-security | 10:48 | |
| *** shohel02 has quit IRC | 10:52 | |
| openstackgerrit | A change was merged to openstack/security-doc: Correct a awkward phrase of Security Guide https://review.openstack.org/107881 | 11:01 |
| *** shohel02 has joined #openstack-security | 11:18 | |
| *** shohel02 has quit IRC | 11:23 | |
| *** elo has quit IRC | 12:02 | |
| *** shohel02 has joined #openstack-security | 12:18 | |
| *** shohel02 has quit IRC | 12:23 | |
| *** elo has joined #openstack-security | 12:41 | |
| *** shohel02 has joined #openstack-security | 13:18 | |
| *** shohel02_ has joined #openstack-security | 13:20 | |
| *** shohel02 has quit IRC | 13:22 | |
| *** shohel02_ has quit IRC | 13:24 | |
| *** paulmo has joined #openstack-security | 14:06 | |
| *** shohel02 has joined #openstack-security | 14:18 | |
| *** shohel02 has quit IRC | 14:22 | |
| *** elo has quit IRC | 14:52 | |
| *** nkinder has joined #openstack-security | 14:52 | |
| *** tmcpeak has joined #openstack-security | 14:53 | |
| *** tmcpeak has quit IRC | 14:58 | |
| *** tmcpeak has joined #openstack-security | 14:59 | |
| *** tmcpeak has quit IRC | 15:03 | |
| *** shohel02 has joined #openstack-security | 15:18 | |
| *** shohel02 has quit IRC | 15:23 | |
| *** bdpayne has joined #openstack-security | 15:38 | |
| *** elo has joined #openstack-security | 15:46 | |
| *** shohel02 has joined #openstack-security | 15:50 | |
| *** shohel02 has quit IRC | 15:54 | |
| bdpayne | nkinder and/or hyakuhei Looks like I need a review and approval from one of you to get this CR in https://review.openstack.org/#/c/107849/ | 15:55 |
| nkinder | bdpayne: looking now | 15:56 |
| nkinder | bdpayne: done | 15:57 |
| bdpayne | thanks | 15:58 |
| *** bknudson has joined #openstack-security | 16:00 | |
| openstackgerrit | A change was merged to openstack/security-doc: Define acronyms inline https://review.openstack.org/107849 | 16:03 |
| *** shohel02 has joined #openstack-security | 16:05 | |
| bdpayne | How do you guys feel about mentioning swauth in the book? Any opinions one way or the other? | 16:30 |
| nkinder | bdpayne: it seems a bit odd to me given that it's onlt for stand-alone swift usage | 16:34 |
| nkinder | s/onlt/only/ | 16:34 |
| bdpayne | yeah | 16:35 |
| bdpayne | it almost feels like it's value is more of historical significance | 16:35 |
| bdpayne | perhaps you could chime in on https://review.openstack.org/#/c/107847/ or the associated bug? | 16:36 |
| bdpayne | I've been on the fence, but would be fine ripping out references to it. | 16:36 |
| nkinder | bdpayne: I just added a comment to the review | 16:41 |
| bdpayne | ok, thanks | 16:42 |
| *** sicarie has joined #openstack-security | 16:44 | |
| *** shohel02 has quit IRC | 16:48 | |
| *** shohel02 has joined #openstack-security | 16:52 | |
| *** bdpayne has quit IRC | 16:55 | |
| openstackgerrit | Nathaniel Dillon proposed a change to openstack/security-doc: Squashing 3 small changes, mostly grammatical fixes, sentence structure, and trailing whitespace https://review.openstack.org/107856 | 17:05 |
| *** malini1 has joined #openstack-security | 17:09 | |
| *** shohel02 has quit IRC | 17:17 | |
| *** sicarie has quit IRC | 17:21 | |
| *** ved_lad has joined #openstack-security | 17:22 | |
| *** shohel02 has joined #openstack-security | 17:25 | |
| *** shohel02 has quit IRC | 17:29 | |
| *** shohel02 has joined #openstack-security | 17:30 | |
| *** shohel02 has quit IRC | 17:37 | |
| *** sicarie has joined #openstack-security | 17:42 | |
| openstackgerrit | Andreas Jaeger proposed a change to openstack/security-doc: Improve ch_messaging-security.xml https://review.openstack.org/107803 | 17:56 |
| *** ved_lad has quit IRC | 18:04 | |
| *** tmcpeak has joined #openstack-security | 18:05 | |
| tmcpeak | nkinder: you around? | 18:09 |
| nkinder | tmcpeak: yep | 18:09 |
| tmcpeak | nkinder: ok, so I've got a fix for this glance shell injection I filed a while back | 18:09 |
| tmcpeak | nkinder: passes test, have it on a different git branch locally | 18:09 |
| tmcpeak | what's the next step to get it into remote gerrit? | 18:10 |
| nkinder | tmcpeak: in your glance repo, you need to set it up for gerrit by running 'git review -s' | 18:11 |
| nkinder | tmcpeak: have you already committed it on your local branch? | 18:11 |
| tmcpeak | not yet | 18:11 |
| nkinder | tmcpeak: ok, cool. | 18:11 |
| tmcpeak | nkinder: have just added it to my branch | 18:11 |
| nkinder | tmcpeak: so run 'git review -s' first, which will install the hook that sets a "change-id" in the commit message every time you commit a change | 18:12 |
| *** ved_lad has joined #openstack-security | 18:12 | |
| nkinder | tmcpeak: the next step would be to locally commit your change on your branch | 18:12 |
| nkinder | tmcpeak: after that, make sure your change is rebased on the lastest master before submitting it for review | 18:13 |
| tmcpeak | nkinder: ok, cool, with you so far | 18:13 |
| nkinder | tmcpeak: that's the usual procedure of switching to master and pulling changes, then going back to your branch and doing a rebase if needed | 18:13 |
| tmcpeak | so that would be 'git commit', followed by 'git pull' | 18:13 |
| tmcpeak | oh yeah, switch to master to pull | 18:14 |
| nkinder | tmcpeak: git checkout master; git pull; git checkout mybranch, git rebase master | 18:14 |
| tmcpeak | what happens if I just pull without switching to master first? | 18:14 |
| nkinder | tmcpeak: nothing, as your local branch isn't "tracking" any remote branch | 18:14 |
| tmcpeak | nkinder: ahhh | 18:14 |
| nkinder | tmcpeak: there's nowhere for it to pull from unless it tracks some other remote branch | 18:14 |
| tmcpeak | right | 18:14 |
| nkinder | if you have conflicts after rebasing, you edit the files to fix them, use 'git add <file>' to mark it as fixed, then 'git rebase --continue' | 18:15 |
| tmcpeak | ok, I've got could not connect to gerrit at ssh://travismcpeak@review.openstack.org:29418/openstack/glance.git | 18:15 |
| tmcpeak | oops wrong username | 18:15 |
| nkinder | tmcpeak: that would be your vpn blocking non http/https perhaps | 18:15 |
| tmcpeak | no, had the hypen as underscore in username | 18:16 |
| nkinder | cool | 18:16 |
| tmcpeak | ok good stuff | 18:16 |
| nkinder | tmcpeak: pnce your rebased (if it's even necessary), just do a 'git review' on your branch | 18:16 |
| nkinder | s/pnce/once/ | 18:16 |
| tmcpeak | :D | 18:16 |
| nkinder | tmcpeak: this is realated to the bug you filed, right? | 18:17 |
| tmcpeak | nkinder: yep | 18:17 |
| nkinder | tmcpeak: if so, you should add a "Closes-bug: <number>" at the bottom of your commit message | 18:17 |
| tmcpeak | ahh ok | 18:17 |
| tmcpeak | what else should be in the commit message? | 18:18 |
| nkinder | tmcpeak: nothing special aside from the one-line summary and a description of the fix in a paragraph | 18:18 |
| paulmo | tmcpeak: This might help: https://wiki.openstack.org/wiki/GitCommitMessages | 18:18 |
| tmcpeak | paulmo: +1 | 18:18 |
| nkinder | tmcpeak: the git-review hook will add the Change-id header for you automatically | 18:18 |
| tmcpeak | nkinder: cool | 18:19 |
| tmcpeak | so now 'git checkout master', 'git pull', merge if necessary, 'git checkout xxx', 'git commit', 'git review' ? | 18:20 |
| nkinder | tmcpeak: almost... | 18:20 |
| nkinder | 'git checkout master', 'git pull', 'git checkout xxx', rebase if necessary, 'git commit', 'git review' | 18:21 |
| tmcpeak | what's the difference between rebase and merge? | 18:21 |
| nkinder | wait, one other mistake | 18:21 |
| nkinder | commit first | 18:21 |
| tmcpeak | commit in xxx branch?, then git checkout master? | 18:22 |
| nkinder | 'git commit', 'git checkout master', 'git pull', 'git checkout xxx', rebase if necessary, 'git review' | 18:22 |
| nkinder | yep | 18:22 |
| nkinder | always commit before switching branches | 18:22 |
| tmcpeak | otherwise I lose the changes? or have to add them again | 18:22 |
| tmcpeak | ? | 18:22 |
| nkinder | tmcpeak: it keeps them in the tree, but you might get errors that changes would be overwritten | 18:22 |
| tmcpeak | ahhh | 18:22 |
| nkinder | tmcpeak: you must commit them, or use 'git stash' | 18:23 |
| nkinder | I typically commit (even WIP stuff) | 18:23 |
| nkinder | ok, so merge vs. rebase... | 18:23 |
| nkinder | rebase is used in your situation where you want to rewind changes on your branch to apply earlier changes from the rebase branch, then it re-applies your patches | 18:24 |
| nkinder | merge takes patches from another branch and applies them on-top of your current branch | 18:24 |
| nkinder | if we weren't using gerrit, the flow would be to do your rebase and send out your patch from the branch for review | 18:25 |
| nkinder | once the review is done, you would merge it back to master and push it | 18:25 |
| nkinder | you shouldn't need to merge often with the workflow we use | 18:25 |
| tmcpeak | nkinder: ahh | 18:26 |
| tmcpeak | crap | 18:29 |
| tmcpeak | nkinder: well | 18:30 |
| tmcpeak | nkinder: bombs away | 18:30 |
| tmcpeak | https://review.openstack.org/#/c/108127/ | 18:30 |
| nkinder | tmcpeak: woohoo! | 18:31 |
| tmcpeak | nknider: :D | 18:31 |
| tmcpeak | nkinder: even | 18:31 |
| tmcpeak | thanks for all the help | 18:31 |
| nkinder | tmcpeak: sure thing | 18:34 |
| tmcpeak | ok flight time, catch you all later | 18:34 |
| *** tmcpeak1 has joined #openstack-security | 18:37 | |
| *** sicarie has quit IRC | 18:38 | |
| *** tmcpeak has quit IRC | 18:41 | |
| *** tmcpeak1 has quit IRC | 18:42 | |
| *** tmcpeak has joined #openstack-security | 18:49 | |
| *** tmcpeak has quit IRC | 18:54 | |
| *** ved_lad has quit IRC | 19:15 | |
| *** sicarie has joined #openstack-security | 19:23 | |
| *** malini1 has quit IRC | 19:36 | |
| *** ved_lad has joined #openstack-security | 20:05 | |
| *** sicarie has quit IRC | 20:14 | |
| *** malini1 has joined #openstack-security | 20:35 | |
| *** bknudson has quit IRC | 21:11 | |
| *** sicarie has joined #openstack-security | 21:24 | |
| openstackgerrit | Nathaniel Dillon proposed a change to openstack/security-doc: Updated awkward wording and repition of 'security considerations' https://review.openstack.org/108153 | 21:46 |
| *** bdpayne has joined #openstack-security | 22:02 | |
| *** malini1 has quit IRC | 22:29 | |
| openstackgerrit | Nathaniel Dillon proposed a change to openstack/security-doc: Updated tense, used removed errant space, smooth sentence structure https://review.openstack.org/108162 | 22:36 |
| *** ved_lad has quit IRC | 22:44 | |
| *** ved_lad has joined #openstack-security | 22:58 | |
| *** bdpayne has quit IRC | 22:59 | |
| *** bdpayne has joined #openstack-security | 23:03 | |
| openstackgerrit | Nathaniel Dillon proposed a change to openstack/security-doc: Replace 'the' with 'this' to add specificity https://review.openstack.org/108166 | 23:05 |
| *** malini1 has joined #openstack-security | 23:05 | |
| *** bdpayne has quit IRC | 23:07 | |
| *** sicarie has quit IRC | 23:11 | |
| *** bdpayne has joined #openstack-security | 23:38 | |
| *** bdpayne has quit IRC | 23:47 | |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!