| *** tmcpeak has quit IRC | 00:07 | |
| *** tmcpeak has joined #openstack-security | 00:07 | |
| *** bknudson has joined #openstack-security | 00:07 | |
| *** tmcpeak has quit IRC | 00:11 | |
| *** bknudson has quit IRC | 00:11 | |
| *** amewz has quit IRC | 00:13 | |
| *** Priti has quit IRC | 00:18 | |
| *** bknudson has joined #openstack-security | 00:28 | |
| *** shohel02 has quit IRC | 00:29 | |
| *** ved_lad has quit IRC | 00:39 | |
| *** Lucas1_ has quit IRC | 00:43 | |
| *** tmcpeak has joined #openstack-security | 00:45 | |
| *** bdpayne has joined #openstack-security | 01:17 | |
| *** tmcpeak has quit IRC | 01:18 | |
| *** shohel02 has joined #openstack-security | 01:20 | |
| *** shohel02 has quit IRC | 01:37 | |
| *** sicarie has quit IRC | 01:37 | |
| *** shohel02 has joined #openstack-security | 01:38 | |
| *** shohel02 has quit IRC | 01:41 | |
| openstackgerrit | A change was merged to openstack/security-doc: Basic cleanup and edits for ch15 https://review.openstack.org/107189 | 01:56 |
|---|---|---|
| *** malini has quit IRC | 01:59 | |
| *** shohel02 has joined #openstack-security | 02:08 | |
| *** shohel02 has quit IRC | 02:09 | |
| *** shohel02 has joined #openstack-security | 02:10 | |
| *** shohel02 has quit IRC | 02:15 | |
| *** shohel02 has joined #openstack-security | 02:18 | |
| *** shohel02 has quit IRC | 02:19 | |
| *** shohel02 has joined #openstack-security | 02:19 | |
| *** shohel02 has quit IRC | 02:24 | |
| *** shohel02 has joined #openstack-security | 03:18 | |
| *** shohel02 has quit IRC | 03:23 | |
| *** shohel02 has joined #openstack-security | 04:18 | |
| *** shohel02 has quit IRC | 04:23 | |
| *** malini has joined #openstack-security | 04:31 | |
| *** malini has quit IRC | 04:56 | |
| openstackgerrit | A change was merged to openstack/security-doc: Backend fixes https://review.openstack.org/107471 | 05:11 |
| *** shohel02 has joined #openstack-security | 05:18 | |
| *** malini has joined #openstack-security | 05:20 | |
| *** shohel02 has quit IRC | 05:23 | |
| *** bdpayne has quit IRC | 05:34 | |
| openstackgerrit | A change was merged to openstack/security-doc: Clarify novncproxy encryption support statement https://review.openstack.org/107492 | 05:37 |
| *** malini has quit IRC | 06:02 | |
| openstackgerrit | OpenStack Proposal Bot proposed a change to openstack/security-doc: Imported Translations from Transifex https://review.openstack.org/107565 | 06:05 |
| *** malini has joined #openstack-security | 06:06 | |
| *** malini has quit IRC | 06:11 | |
| *** malini has joined #openstack-security | 06:12 | |
| *** shohel02 has joined #openstack-security | 06:18 | |
| *** shohel02 has quit IRC | 06:23 | |
| *** gmurphy has quit IRC | 06:34 | |
| *** gmurphy has joined #openstack-security | 06:35 | |
| *** shohel02 has joined #openstack-security | 07:18 | |
| *** shohel02 has quit IRC | 07:23 | |
| *** shohel02 has joined #openstack-security | 07:27 | |
| *** shohel02 has quit IRC | 08:06 | |
| *** shohel02 has joined #openstack-security | 08:10 | |
| *** malini has quit IRC | 08:12 | |
| *** shohel02 has quit IRC | 08:15 | |
| *** shohel02 has joined #openstack-security | 08:36 | |
| *** shohel02 has quit IRC | 08:38 | |
| *** shohel02_ has joined #openstack-security | 08:38 | |
| *** shohel02_ has quit IRC | 08:43 | |
| *** shohel02 has joined #openstack-security | 09:39 | |
| *** shohel02 has quit IRC | 09:43 | |
| *** shohel02 has joined #openstack-security | 10:40 | |
| *** shohel02 has quit IRC | 10:44 | |
| *** shohel02 has joined #openstack-security | 11:18 | |
| *** shohel02 has quit IRC | 11:23 | |
| *** shohel02 has joined #openstack-security | 12:18 | |
| *** shohel02 has quit IRC | 12:22 | |
| *** bknudson has quit IRC | 13:35 | |
| *** malini2 has joined #openstack-security | 13:55 | |
| *** bknudson has joined #openstack-security | 14:00 | |
| *** shohel02 has joined #openstack-security | 14:18 | |
| *** shohel02 has quit IRC | 14:23 | |
| *** malini2 has quit IRC | 14:49 | |
| *** 18VAAEB97 has joined #openstack-security | 15:07 | |
| *** shohel02 has joined #openstack-security | 15:18 | |
| *** shohel02 has quit IRC | 15:23 | |
| *** shohel02 has joined #openstack-security | 15:28 | |
| *** shohel02 has quit IRC | 15:28 | |
| *** sicarie has joined #openstack-security | 15:29 | |
| *** tmcpeak has joined #openstack-security | 15:36 | |
| *** shohel02 has joined #openstack-security | 15:38 | |
| *** shohel02 has quit IRC | 15:42 | |
| *** 18VAAEB97 has quit IRC | 15:44 | |
| *** bdpayne has joined #openstack-security | 15:56 | |
| *** amewz has joined #openstack-security | 15:56 | |
| *** Lucas1_ has joined #openstack-security | 15:58 | |
| hyakuhei | bdpayne: How are you doing? | 15:59 |
| *** bdpayne_ has joined #openstack-security | 16:00 | |
| bdpayne_ | hyakuhei did you see my reply above? my irc client is being weird | 16:01 |
| *** shohel02 has joined #openstack-security | 16:02 | |
| *** bdpayne has quit IRC | 16:03 | |
| tmcpeak | bdpayne_ we didn't… how are you? | 16:14 |
| *** malini1 has joined #openstack-security | 16:21 | |
| hyakuhei | :-S | 16:24 |
| *** Priti has joined #openstack-security | 16:26 | |
| *** tmcpeak1 has joined #openstack-security | 16:42 | |
| *** tmcpeak2 has joined #openstack-security | 16:43 | |
| *** tmcpeak has quit IRC | 16:45 | |
| tmcpeak2 | wow, how many of me | 16:45 |
| *** tmcpeak1 has quit IRC | 16:47 | |
| bdpayne_ | tmcpeak2 I'm doing alright, I'll be heading in to join you guys shortly. | 16:54 |
| bdpayne_ | Assuming that's alright at your end :-) | 16:54 |
| *** bdpayne_ has quit IRC | 16:56 | |
| tmcpeak2 | bdpayne_: awesome! | 17:05 |
| *** bdpayne has joined #openstack-security | 17:18 | |
| *** ShelleeA has joined #openstack-security | 17:32 | |
| openstackgerrit | A change was merged to openstack/security-doc: Imported Translations from Transifex https://review.openstack.org/107565 | 17:34 |
| *** malini1 has quit IRC | 17:49 | |
| *** shohel02 has quit IRC | 17:55 | |
| *** malini1 has joined #openstack-security | 17:59 | |
| *** shohel02 has joined #openstack-security | 18:19 | |
| *** ved_lad has joined #openstack-security | 18:20 | |
| bdpayne | https://code.google.com/p/cryptsetup/wiki/DMVerity | 18:23 |
| *** elo has joined #openstack-security | 18:24 | |
| elo | Hello | 18:24 |
| tmcpeak2 | 'elo | 18:24 |
| tmcpeak2 | :D | 18:24 |
| bdpayne | elo How's it going with the networking chapters? | 18:30 |
| elo | i'll work on it tonight… | 18:36 |
| elo | I had a one question: I know that we need to be consistent with nomenclature usage in our document… | 18:38 |
| bdpayne | yes, that's the goal | 18:39 |
| elo | should we escalate that we are consistent with usage across all documentation? I noticed that the training material diagrams and name convention are different to our document and operational guide | 18:39 |
| bdpayne | yeah, it would be good to sync across all docs | 18:40 |
| bdpayne | so yeah, I'd bring that up | 18:40 |
| elo | thanks… I've review the https://wiki.openstack.org/wiki/Documentation/Conventions and will submit the bugs and patches to change these sections to follow it. | 18:48 |
| bdpayne | excellent, thanks! | 18:56 |
| openstackgerrit | Sriram Subramanian proposed a change to openstack/security-doc: Fix Style Issues https://review.openstack.org/107516 | 18:57 |
| openstackgerrit | Andreas Jaeger proposed a change to openstack/security-doc: Fix VMware misspelling https://review.openstack.org/107798 | 19:00 |
| openstackgerrit | Andreas Jaeger proposed a change to openstack/security-doc: Capitalize Linux https://review.openstack.org/107800 | 19:03 |
| hyakuhei | chair6: Foodz | 19:04 |
| hyakuhei | tmcpeak2: f00d | 19:04 |
| tmcpeak2 | wooohooo | 19:04 |
| openstackgerrit | Sriram Subramanian proposed a change to openstack/security-doc: Add reference to SSL/TLS chapter https://review.openstack.org/107802 | 19:12 |
| openstackgerrit | A change was merged to openstack/security-doc: Fix VMware misspelling https://review.openstack.org/107798 | 19:12 |
| openstackgerrit | A change was merged to openstack/security-doc: Capitalize Linux https://review.openstack.org/107800 | 19:12 |
| openstackgerrit | A change was merged to openstack/security-doc: Fix Style Issues https://review.openstack.org/107516 | 19:12 |
| openstackgerrit | Andreas Jaeger proposed a change to openstack/security-doc: Improve ch_messaging-security.xml https://review.openstack.org/107803 | 19:14 |
| openstackgerrit | Andreas Jaeger proposed a change to openstack/security-doc: Improve ch_messaging-security.xml https://review.openstack.org/107803 | 19:22 |
| openstackgerrit | A change was merged to openstack/security-doc: Add reference to SSL/TLS chapter https://review.openstack.org/107802 | 19:30 |
| *** shohel02 has quit IRC | 19:33 | |
| *** elo has quit IRC | 19:34 | |
| *** tmcpeak2 has quit IRC | 19:48 | |
| *** ved_lad has quit IRC | 19:49 | |
| *** shohel02 has joined #openstack-security | 19:53 | |
| *** ved_lad has joined #openstack-security | 20:04 | |
| *** amewz has quit IRC | 20:26 | |
| *** malini1 has quit IRC | 20:40 | |
| *** malini has joined #openstack-security | 20:52 | |
| *** tmcpeak has joined #openstack-security | 21:02 | |
| tmcpeak | chair6: wanna accept that pull request? | 21:02 |
| *** shohel02 has quit IRC | 21:03 | |
| *** shohel02 has joined #openstack-security | 21:04 | |
| chair6 | tmcpeak done.. | 21:06 |
| *** elo has joined #openstack-security | 21:07 | |
| tmcpeak | sweet | 21:08 |
| *** oeitei has joined #openstack-security | 21:09 | |
| *** oeitei has quit IRC | 21:10 | |
| *** bdpayne has quit IRC | 21:43 | |
| *** bdpayne has joined #openstack-security | 22:00 | |
| openstackgerrit | Nathaniel Dillon proposed a change to openstack/security-doc: Combining sentences and clarifying risk https://review.openstack.org/107842 | 22:03 |
| openstackgerrit | Mike Lange proposed a change to openstack/security-doc: ISO 27K standard updated for 2013 https://review.openstack.org/106880 | 22:05 |
| *** bknudson has quit IRC | 22:13 | |
| bdpayne | could someone help mike rebase his ISO27K commit ^^ ? | 22:21 |
| *** shohel02 has quit IRC | 22:22 | |
| *** shohel02 has joined #openstack-security | 22:23 | |
| bdpayne | Also, for all of the people working on filing bugs on the book... please update the google doc with which sections you have been able to complete. This will help us know where to pick up post-this week. | 22:36 |
| *** malini has quit IRC | 22:37 | |
| sicarie | bdpayne - I have mike next to me - is it the rebase -i command? | 22:37 |
| bdpayne | yeah... but first he needs to update his master branch, and then make sure that his dev branch is rebased on top of master | 22:38 |
| bdpayne | git checkout master | 22:38 |
| bdpayne | git pull | 22:38 |
| bdpayne | git checkout <devbranch> | 22:38 |
| bdpayne | git rebase -i master | 22:38 |
| bdpayne | git log // verify that everything looks ok | 22:38 |
| bdpayne | git review | 22:38 |
| bdpayne | oh wait | 22:40 |
| bdpayne | it may be better than I thought | 22:40 |
| bdpayne | yeah, it looks ok to me now | 22:41 |
| bdpayne | sicarie ^^ | 22:41 |
| sicarie | Cool, thanks! | 22:41 |
| sicarie | What is 'rebase'? | 22:41 |
| sicarie | I think I need to do the same thing | 22:41 |
| sicarie | I have two updates queued, but I created them inside other branches, so I think they're thinking they're dependent on the old branches? | 22:42 |
| *** malini has joined #openstack-security | 22:42 | |
| bdpayne | so each change is in it's own branch? | 22:43 |
| sicarie | Yes | 22:44 |
| bdpayne | if you change to one of those branches (git checkout <branchname>) then you can do a (git log) | 22:44 |
| sicarie | Yep | 22:44 |
| bdpayne | so then you want to see one commit for your change | 22:44 |
| bdpayne | and the rest should just be the upstream changes | 22:45 |
| sicarie | Yes, I see all of my changes | 22:45 |
| bdpayne | are they listed in multiple commits? | 22:45 |
| bdpayne | or in one commit? | 22:45 |
| sicarie | Multiple | 22:45 |
| bdpayne | ok, so you can use rebase to squash them into a single commit | 22:45 |
| bdpayne | which is what you'll want to do before doing a "git review" | 22:46 |
| bdpayne | follow the commands I listed above to update master and then rebase your branch | 22:46 |
| sicarie | k | 22:46 |
| bdpayne | when in the rebase interactive mode... you'll keep the top commit of your own as "pick" and then choose "s" (for squash) on everything under that | 22:46 |
| bdpayne | that will squash those into the picked commit | 22:46 |
| bdpayne | it will then take you to another screen where you can adjust the commit message accordingly | 22:47 |
| sicarie | It's stuck on pull | 22:49 |
| *** ShelleeA has quit IRC | 22:50 | |
| *** Priti has quit IRC | 22:50 | |
| *** Lucas1_ has quit IRC | 22:50 | |
| *** sicarie has quit IRC | 22:50 | |
| *** ShelleeA has joined #openstack-security | 22:51 | |
| *** Priti has joined #openstack-security | 22:51 | |
| *** Lucas1_ has joined #openstack-security | 22:51 | |
| *** sicarie has joined #openstack-security | 22:51 | |
| bdpayne | stuck on pull? | 22:51 |
| *** elo has quit IRC | 22:51 | |
| *** ved_lad has quit IRC | 22:51 | |
| sicarie | Connection timing out | 22:52 |
| *** elo has joined #openstack-security | 22:53 | |
| *** ved_lad has joined #openstack-security | 22:53 | |
| tmcpeak | https://bugs.launchpad.net/glance/+bug/1335208 | 22:54 |
| *** mgagne has quit IRC | 22:54 | |
| *** mgagne has joined #openstack-security | 22:55 | |
| openstackgerrit | Sriram Subramanian proposed a change to openstack/security-doc: Clarify usage of SWAuth https://review.openstack.org/107847 | 22:57 |
| bdpayne | can you provide the exact error message? | 22:58 |
| sicarie | I think it's my desktop acting up gain - I'm going to go take a look at it | 22:59 |
| bdpayne | ok | 23:03 |
| *** YANETH has joined #openstack-security | 23:07 | |
| *** YANETH has left #openstack-security | 23:10 | |
| openstackgerrit | Bryan D. Payne proposed a change to openstack/security-doc: Define acronyms inline https://review.openstack.org/107849 | 23:11 |
| openstackgerrit | Sriram Subramanian proposed a change to openstack/security-doc: Fix Grammatical Error https://review.openstack.org/107850 | 23:11 |
| sicarie | bdpayne - I ran the rebase -i master and I'm in nano - do I just lead the line with s and it will 'squash'? | 23:12 |
| bdpayne | yeah, replace the work pick with s or squash | 23:12 |
| bdpayne | but you need to pick one line | 23:12 |
| bdpayne | and squash others into it | 23:12 |
| bdpayne | *pick one line that is your own commit | 23:12 |
| sicarie | So I hit s and there's just the s character in front of hte line | 23:12 |
| bdpayne | does it still say pick? | 23:13 |
| *** malini has quit IRC | 23:13 | |
| bdpayne | for example, is it now "spick"? | 23:13 |
| sicarie | it says spick | 23:13 |
| *** shohel02 has quit IRC | 23:13 | |
| bdpayne | ok, delete pick | 23:13 |
| bdpayne | so it just has s | 23:13 |
| sicarie | k | 23:14 |
| sicarie | and only the latest line has pick | 23:14 |
| sicarie | Correct? | 23:14 |
| bdpayne | no | 23:14 |
| bdpayne | pick on the first line that you want to keep | 23:15 |
| bdpayne | s on the ones *under* it that will get squashed into the pick | 23:15 |
| sicarie | Right | 23:15 |
| sicarie | So I have to move the other lines under that one? | 23:15 |
| bdpayne | the one that you pick is arbitrary, assuming that you are squashing them all together | 23:16 |
| bdpayne | so just pick your first, and squash the others | 23:16 |
| bdpayne | you will get another screen next to adjust the commit message | 23:16 |
| *** ShelleeA has quit IRC | 23:16 | |
| sicarie | Okay, should I adjust it? | 23:17 |
| bdpayne | I can't see what you're seeing, so I'm not sure ;-) | 23:17 |
| bdpayne | is there someone else in the room that could look over your shoulder? | 23:17 |
| sicarie | Haha, should I make the description more inclusive of all three changes? | 23:17 |
| bdpayne | so yes, you will need to adjust teh commit message | 23:18 |
| *** Priti has quit IRC | 23:18 | |
| bdpayne | you want a single message that conforms to the proper style | 23:18 |
| bdpayne | are you working on a specific bug? | 23:18 |
| sicarie | Yes, only doing this will combine 3 | 23:18 |
| sicarie | Or attempt to | 23:18 |
| bdpayne | ahh | 23:18 |
| bdpayne | 3 small changes? | 23:18 |
| sicarie | yes | 23:19 |
| bdpayne | ok, so you can list Closes-Bug: #xxx three times | 23:19 |
| bdpayne | three separate lines | 23:19 |
| sicarie | k | 23:19 |
| bdpayne | at the top you want a line that summaries it all briefly | 23:20 |
| bdpayne | then a blank line | 23:20 |
| bdpayne | then a longer description (multiple lines) | 23:20 |
| sicarie | OK | 23:20 |
| bdpayne | then the closes bugs lines | 23:20 |
| sicarie | Ok | 23:22 |
| sicarie | Updated | 23:22 |
| sicarie | Now I need to amend it, correct? | 23:23 |
| Lucas1_ | bdpayne: going to Cannon (next to Von Trapps) at 6pm | 23:23 |
| bdpayne | ok, thanks | 23:23 |
| bdpayne | sicarie do a "git log" and see how it looks, probably no need to amend | 23:23 |
| sicarie | I already submitted the first | 23:24 |
| bdpayne | the first? | 23:24 |
| sicarie | [15:03] <openstackgerrit> Nathaniel Dillon proposed a change to openstack/security-doc: Combining sentences and clarifying risk https://review.openstack.org/107842 | 23:24 |
| sicarie | I was moving on to the second when I saw that message | 23:24 |
| sicarie | Wasn't sure what type of error it was, so I went on to the third, figuring I'd come back to the second | 23:24 |
| bdpayne | hrm | 23:25 |
| bdpayne | so you already have a CR up for 1/3 of the commits that you just merged together? | 23:25 |
| sicarie | yep | 23:25 |
| bdpayne | ahh | 23:26 |
| bdpayne | so this is a problem | 23:26 |
| bdpayne | you'll need to either close that earlier CR (probably easier) or fix your current branch to not include that change | 23:26 |
| bdpayne | you don't want the same change in multiple CRs... | 23:27 |
| sicarie | ok - how do I fix the branch to not include the change? | 23:27 |
| bdpayne | manually remove it | 23:27 |
| bdpayne | the commit that change | 23:28 |
| bdpayne | then rebase and squash | 23:28 |
| bdpayne | or, like I said, you can just close out the earlier CR | 23:28 |
| sicarie | Is that the easier method? | 23:28 |
| bdpayne | Lucas1_ Canon: Seating is subject to availability. Our small, intimate restaurant can accommodate parties of 6 or less. | 23:29 |
| sicarie | Yeah, everyone's gone | 23:29 |
| bdpayne | I think it would probably be easier at this point, yeah | 23:29 |
| sicarie | There are 5 guys in the room,a nd I'm going home | 23:29 |
| sicarie | So to close out the CR do I wait for it to be +2'd? | 23:30 |
| bdpayne | sicarie To close it out, just do it now. | 23:30 |
| bdpayne | That will save others the wasted effort of reviewing that one. | 23:31 |
| bdpayne | Just click the abandon button. | 23:31 |
| bdpayne | Lucas1_ It looks good, but I don't think my system can quite handle the fare at Canon right now. | 23:32 |
| sicarie | Okay, I have abandoned | 23:32 |
| sicarie | So now I can git review? | 23:33 |
| bdpayne | yeah | 23:34 |
| sicarie | ! [remote rejected] HEAD -> refs/publish/master/bug/1342328 (missing Change-Id in commit message footer) | 23:34 |
| bdpayne | ahh | 23:34 |
| bdpayne | did that message list a change id? | 23:34 |
| bdpayne | usually it just above that error | 23:35 |
| sicarie | Yes, one | 23:35 |
| sicarie | and it looks like I left out a : after Closes-Bug | 23:35 |
| bdpayne | so just do an amend to add it | 23:35 |
| sicarie | git commit --amend | 23:36 |
| sicarie | ? | 23:36 |
| bdpayne | yeah | 23:36 |
| sicarie | And put the change ID below Closes-Bug lines? | 23:36 |
| sicarie | Nevermind, it's already there | 23:37 |
| sicarie | Do I need the Change ID's from the other two changes? | 23:37 |
| bdpayne | no, just one per CR | 23:37 |
| openstackgerrit | Nathaniel Dillon proposed a change to openstack/security-doc: Squashing 3 small changes, mostly grammatical and sentence structure https://review.openstack.org/107856 | 23:37 |
| sicarie | There we go | 23:37 |
| sicarie | Thanks! | 23:37 |
| bdpayne | ah, so close | 23:38 |
| bdpayne | can you do another amend? | 23:38 |
| bdpayne | "Closes-Bua:g #1342328" | 23:38 |
| bdpayne | clean up that typo | 23:38 |
| Lucas1_ | bdpayne Understand. Only a few of us left anyway. | 23:39 |
| sicarie | Sorry, used to vi | 23:39 |
| openstackgerrit | Nathaniel Dillon proposed a change to openstack/security-doc: Squashing 3 small changes, mostly grammatical and sentence structure https://review.openstack.org/107856 | 23:39 |
| bdpayne | sicarie looks better, thanks! | 23:41 |
| sicarie | awesome, have a good weekend! | 23:41 |
| *** sicarie has quit IRC | 23:42 | |
| *** tmcpeak has quit IRC | 23:49 | |
| *** Lucas1_ has quit IRC | 23:54 | |
| *** bknudson has joined #openstack-security | 23:56 | |
| *** bdpayne has quit IRC | 23:59 | |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!