| *** dmacpher has joined #openstack-doc | 00:05 | |
| *** igordcard has joined #openstack-doc | 00:05 | |
| *** igordcard has quit IRC | 00:14 | |
| *** JRobinson__ has quit IRC | 00:15 | |
| *** igordcard has joined #openstack-doc | 00:16 | |
| *** Piet has joined #openstack-doc | 00:21 | |
| *** Swami has quit IRC | 00:22 | |
| *** igordcard has quit IRC | 00:23 | |
| *** JRobinson__ has joined #openstack-doc | 00:30 | |
| *** pritesh has quit IRC | 00:33 | |
| *** suyog has joined #openstack-doc | 00:34 | |
| *** furface has joined #openstack-doc | 00:37 | |
| *** furface|mtg has quit IRC | 00:41 | |
| *** packet has joined #openstack-doc | 00:44 | |
| *** ChanServ changes topic to "Rocking the OpenStack docs since 2010. Read the docs: http://docs.openstack.org | Write the docs: http://wiki.openstack.org/Documentation/HowTo | Review the docs: http://is.gd/openstackdocreview" | 00:55 | |
| -openstackstatus- NOTICE: Gerrit has been downgraded to version 2.8 due to the issues observed today. Please report further problems in #openstack-infra. | 00:55 | |
| *** tobe has joined #openstack-doc | 00:58 | |
| *** j1mc has joined #openstack-doc | 01:00 | |
| *** Marga_ has quit IRC | 01:07 | |
| *** sarob has quit IRC | 01:09 | |
| *** bmoss has joined #openstack-doc | 01:12 | |
| *** patrickeast has quit IRC | 01:22 | |
| *** redrobot has quit IRC | 01:25 | |
| *** stevemar has joined #openstack-doc | 01:25 | |
| *** redrobot has joined #openstack-doc | 01:26 | |
| *** redrobot is now known as Guest20306 | 01:26 | |
| *** dmacpher has quit IRC | 01:29 | |
| *** adahms has joined #openstack-doc | 01:29 | |
| openstackgerrit | Merged openstack/openstack-manuals: Simplify RST building https://review.openstack.org/181729 | 01:45 |
|---|---|---|
| openstackgerrit | Merged openstack/training-guides: Add community intro slide to training ch 02 https://review.openstack.org/181446 | 01:47 |
| openstackgerrit | Merged openstack/training-guides: Fixes cinder races https://review.openstack.org/175825 | 01:47 |
| *** sigmavirus24 is now known as sigmavirus24_awa | 01:54 | |
| *** packet has quit IRC | 02:00 | |
| *** sarob has joined #openstack-doc | 02:03 | |
| *** suyog has quit IRC | 02:10 | |
| *** JRobinson__ has quit IRC | 02:12 | |
| *** suyog has joined #openstack-doc | 02:14 | |
| *** JRobinson__ has joined #openstack-doc | 02:14 | |
| *** sarob has quit IRC | 02:15 | |
| *** sigmavirus24_awa is now known as sigmavirus24 | 02:21 | |
| *** dmacpher has joined #openstack-doc | 02:36 | |
| *** packet has joined #openstack-doc | 02:45 | |
| *** packet has quit IRC | 02:47 | |
| *** koolhead17 has joined #openstack-doc | 02:56 | |
| *** sarob has joined #openstack-doc | 03:00 | |
| *** JRobinson__ has quit IRC | 03:18 | |
| *** JRobinson__ has joined #openstack-doc | 03:19 | |
| *** amotoki_ has joined #openstack-doc | 03:30 | |
| *** stevemar has quit IRC | 03:31 | |
| *** sarob has quit IRC | 03:36 | |
| *** jecarey_ has joined #openstack-doc | 03:36 | |
| *** sarob has joined #openstack-doc | 03:36 | |
| *** suyog has quit IRC | 03:37 | |
| *** watanabe_isao has quit IRC | 03:42 | |
| *** j1mc has quit IRC | 03:44 | |
| *** sarob has quit IRC | 03:45 | |
| *** suyog has joined #openstack-doc | 03:49 | |
| *** suyog has quit IRC | 03:53 | |
| *** suyog has joined #openstack-doc | 03:53 | |
| *** sayan has joined #openstack-doc | 03:55 | |
| *** watanabe_isao has joined #openstack-doc | 03:58 | |
| *** ddomingo has joined #openstack-doc | 04:00 | |
| *** sigmavirus24 is now known as sigmavirus24_awa | 04:05 | |
| *** shaunm__ has quit IRC | 04:20 | |
| *** asettle has quit IRC | 04:21 | |
| *** shaunm has quit IRC | 04:21 | |
| *** asettle has joined #openstack-doc | 04:24 | |
| *** koolhead17 has quit IRC | 04:24 | |
| *** ildikov has quit IRC | 04:33 | |
| *** reed_ has joined #openstack-doc | 04:36 | |
| *** Marga_ has joined #openstack-doc | 04:36 | |
| *** Marga__ has joined #openstack-doc | 04:37 | |
| *** Marga_ has quit IRC | 04:41 | |
| *** reed_ has quit IRC | 04:43 | |
| openstackgerrit | Brian Moss proposed openstack/openstack-manuals: Remove passive voice from chap 5, arch guide https://review.openstack.org/180881 | 04:45 |
| *** ildikov has joined #openstack-doc | 04:46 | |
| *** tobe has quit IRC | 04:52 | |
| *** stevemar has joined #openstack-doc | 04:54 | |
| *** ildikov has quit IRC | 04:59 | |
| *** watanabe_isao has quit IRC | 05:07 | |
| openstackgerrit | Brian Moss proposed openstack/openstack-manuals: Remove passive voice from chap 5, arch guide https://review.openstack.org/180881 | 05:07 |
| openstackgerrit | Deepti Navale proposed openstack/openstack-manuals: Updates to Config ref and Cloud Admin guide based on info sent by SME https://review.openstack.org/180382 | 05:07 |
| *** watanabe_isao has joined #openstack-doc | 05:14 | |
| *** shaunm has joined #openstack-doc | 05:18 | |
| *** shaunm_ has joined #openstack-doc | 05:18 | |
| *** asettle has quit IRC | 05:30 | |
| *** ildikov has joined #openstack-doc | 05:38 | |
| *** suyog has quit IRC | 05:39 | |
| *** suyog has joined #openstack-doc | 05:41 | |
| *** sayan has quit IRC | 05:43 | |
| *** JRobinson__ has quit IRC | 05:49 | |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: Unify checkbuild and publishdocs https://review.openstack.org/181717 | 05:57 |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: Share common RST directory https://review.openstack.org/182067 | 05:59 |
| *** koolhead17 has joined #openstack-doc | 06:00 | |
| *** sayan has joined #openstack-doc | 06:01 | |
| openstackgerrit | Merged openstack/openstack-manuals: User Guides: Install CLIs is for both guides https://review.openstack.org/182005 | 06:05 |
| *** sayan has quit IRC | 06:08 | |
| openstackgerrit | OpenStack Proposal Bot proposed openstack/openstack-manuals: Imported Translations from Transifex https://review.openstack.org/182162 | 06:11 |
| *** furface has quit IRC | 06:15 | |
| *** coolsvap|afk is now known as coolsvap | 06:18 | |
| *** tobe has joined #openstack-doc | 06:19 | |
| *** tobe has quit IRC | 06:19 | |
| *** coolsvap is now known as coolsvap|afk | 06:21 | |
| *** sayan has joined #openstack-doc | 06:24 | |
| *** coolsvap|afk has quit IRC | 06:28 | |
| *** asettle has joined #openstack-doc | 06:28 | |
| *** coolsvap has joined #openstack-doc | 06:29 | |
| *** ddomingo has quit IRC | 06:38 | |
| *** Marga__ has quit IRC | 06:48 | |
| *** stevemar has quit IRC | 06:57 | |
| *** adahms has quit IRC | 06:58 | |
| *** tobe43 has joined #openstack-doc | 07:00 | |
| *** asettle has quit IRC | 07:06 | |
| *** bmoss is now known as himself | 07:23 | |
| *** himself is now known as bmoss | 07:23 | |
| *** katyafervent is now known as katyafervent_awa | 07:24 | |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-doc-tools: Fix RST languages https://review.openstack.org/182178 | 07:25 |
| *** katyafervent_awa is now known as katyafervent | 07:26 | |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: Share common RST directory https://review.openstack.org/182067 | 07:32 |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: Move RST Glossary to common-rst https://review.openstack.org/182179 | 07:32 |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: Move User Guides into separate directories https://review.openstack.org/182180 | 07:32 |
| *** koolhead17 has quit IRC | 07:38 | |
| *** suyog has quit IRC | 07:38 | |
| *** koolhead17 has joined #openstack-doc | 07:39 | |
| *** koolhead17 has quit IRC | 07:51 | |
| *** jpena has joined #openstack-doc | 07:52 | |
| *** koolhead17 has joined #openstack-doc | 07:52 | |
| *** openstackstatus has quit IRC | 07:52 | |
| *** openstack has joined #openstack-doc | 07:55 | |
| *** koolhead17 has quit IRC | 07:55 | |
| *** koolhead_ has joined #openstack-doc | 07:55 | |
| openstackgerrit | venkatamahesh proposed openstack/security-doc: Fix bug 1447302, sentences under Domain names were modified. https://review.openstack.org/181832 | 08:17 |
| openstack | bug 1447302 in openstack-manuals "Chapter 7. Dashboard in OpenStack Security Guide - Malformed Sentences" [Low,In progress] https://launchpad.net/bugs/1447302 - Assigned to venkatamahesh (venkatamaheshkotha) | 08:17 |
| *** koolhead_ has quit IRC | 08:26 | |
| *** matjazp has joined #openstack-doc | 08:27 | |
| *** koolhead17 has joined #openstack-doc | 08:29 | |
| *** Marga_ has joined #openstack-doc | 08:42 | |
| *** watanabe_isao has quit IRC | 08:44 | |
| *** koolhead17 has quit IRC | 08:50 | |
| *** koolhead17 has joined #openstack-doc | 08:51 | |
| *** koolhead17 has quit IRC | 08:55 | |
| openstackgerrit | Merged openstack/openstack-manuals: Imported Translations from Transifex https://review.openstack.org/182162 | 08:59 |
| *** dmacpher has quit IRC | 09:24 | |
| *** tobe43 has quit IRC | 09:31 | |
| *** dnavale has quit IRC | 09:32 | |
| *** chandankumar has joined #openstack-doc | 09:49 | |
| *** MasterPiece`` has joined #openstack-doc | 09:56 | |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: Share common RST directory https://review.openstack.org/182067 | 09:57 |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: Move RST Glossary to common-rst https://review.openstack.org/182179 | 09:57 |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: Move User Guides into separate directories https://review.openstack.org/182180 | 09:57 |
| *** matjazp has quit IRC | 09:57 | |
| *** MasterPiece`` has quit IRC | 10:06 | |
| *** koolhead17 has joined #openstack-doc | 10:12 | |
| *** bmoss has quit IRC | 10:27 | |
| *** sayan has quit IRC | 10:35 | |
| *** sayan has joined #openstack-doc | 10:47 | |
| *** pc_m has joined #openstack-doc | 10:47 | |
| *** sayan has quit IRC | 10:51 | |
| *** coolsvap is now known as coolsvap|afk | 10:52 | |
| *** sayan has joined #openstack-doc | 10:52 | |
| *** dguitarbite has joined #openstack-doc | 11:15 | |
| *** MasterPiece has joined #openstack-doc | 11:28 | |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: Unify checkbuild and publishdocs https://review.openstack.org/181717 | 11:34 |
| *** sayan has quit IRC | 11:51 | |
| *** ildikov has quit IRC | 12:02 | |
| *** adahms has joined #openstack-doc | 12:02 | |
| *** berndbausch has joined #openstack-doc | 12:06 | |
| *** matjazp has joined #openstack-doc | 12:07 | |
| *** matjazp has quit IRC | 12:13 | |
| *** Piet has quit IRC | 12:16 | |
| *** ildikov has joined #openstack-doc | 12:17 | |
| *** matjazp has joined #openstack-doc | 12:21 | |
| *** jpena is now known as jpena|lunch | 12:26 | |
| *** Marga_ has quit IRC | 12:38 | |
| *** KLevenstein has joined #openstack-doc | 12:41 | |
| openstackgerrit | Chris Ricker proposed openstack/training-guides: Upstream Ch 03 updates https://review.openstack.org/182270 | 12:45 |
| KLevenstein | Install guide team meeting: https://plus.google.com/hangouts/_/calendar/a2FyaW4ua2F0aG9kZUBnbWFpbC5jb20.jj2lu2nbj71a0dan11vatdav3k | 13:00 |
| AJaeger | KLevenstein: just a quick update from dguitarbite: Installation until Horizon for SLES 12 and openSUSE 13.2 works fine | 13:01 |
| AJaeger | KLevenstein: both of us can't join | 13:02 |
| KLevenstein | AJaeger | 13:02 |
| KLevenstein | thanks | 13:02 |
| KLevenstein | ah, okay, thanks | 13:02 |
| AJaeger | KLevenstein: one minor patch coming from him - and we wait for berendt's fedora patch to merge on the keystone/apache setup | 13:02 |
| * AJaeger shouldn't have put it after berendt's but it's too large to easily change the order | 13:02 | |
| KLevenstein | AJaeger: okay, thanks for the update | 13:03 |
| *** ildikov has quit IRC | 13:07 | |
| *** pshige has joined #openstack-doc | 13:16 | |
| *** jecarey_ has quit IRC | 13:22 | |
| *** ildikov has joined #openstack-doc | 13:23 | |
| *** sarob has joined #openstack-doc | 13:24 | |
| *** sarob has quit IRC | 13:24 | |
| *** sarob has joined #openstack-doc | 13:25 | |
| *** zz_steveortiz is now known as steveortiz | 13:32 | |
| *** annegentle has joined #openstack-doc | 13:35 | |
| *** sarob_ has joined #openstack-doc | 13:35 | |
| *** mattfarina has joined #openstack-doc | 13:38 | |
| *** sarob has quit IRC | 13:38 | |
| *** jpena|lunch has quit IRC | 13:44 | |
| *** sarob_ has quit IRC | 13:45 | |
| *** sarob has joined #openstack-doc | 13:45 | |
| *** jpena|lunch has joined #openstack-doc | 13:52 | |
| *** sarob has quit IRC | 13:52 | |
| *** matjazp has quit IRC | 13:56 | |
| openstackgerrit | Diane Fleming proposed openstack/api-site: Fix list extensions and get extension calls for Compute v2 https://review.openstack.org/181140 | 13:58 |
| *** jecarey has joined #openstack-doc | 13:59 | |
| *** sarob has joined #openstack-doc | 14:01 | |
| *** ildikov has quit IRC | 14:05 | |
| *** Marga_ has joined #openstack-doc | 14:11 | |
| *** koolhead17 has quit IRC | 14:16 | |
| *** Marga_ has quit IRC | 14:16 | |
| *** sarob has quit IRC | 14:17 | |
| *** koolhead17 has joined #openstack-doc | 14:17 | |
| *** Marga_ has joined #openstack-doc | 14:17 | |
| *** stevemar has joined #openstack-doc | 14:17 | |
| *** ildikov has joined #openstack-doc | 14:21 | |
| *** annegentle has quit IRC | 14:21 | |
| *** annegentle has joined #openstack-doc | 14:22 | |
| *** koolhead17 has quit IRC | 14:22 | |
| *** sigmavirus24_awa is now known as sigmavirus24 | 14:25 | |
| *** MasterPiece has quit IRC | 14:25 | |
| *** MasterPiece has joined #openstack-doc | 14:29 | |
| *** sarob has joined #openstack-doc | 14:33 | |
| *** sarob has quit IRC | 14:35 | |
| *** chandankumar has quit IRC | 14:36 | |
| *** jpena|lunch is now known as jpena | 14:37 | |
| *** Guest20306 is now known as redrobot | 14:39 | |
| *** emagana has joined #openstack-doc | 14:42 | |
| *** adahms has quit IRC | 14:44 | |
| openstackgerrit | Anne Gentle proposed openstack/api-site: Add API Documentation for Vlan Transparency Extension https://review.openstack.org/181195 | 14:44 |
| openstackgerrit | Anne Gentle proposed openstack/api-site: Add API Documentation for Vlan Transparency Extension https://review.openstack.org/181195 | 14:49 |
| *** reed_ has joined #openstack-doc | 14:54 | |
| *** reed_ has quit IRC | 14:57 | |
| openstackgerrit | Pranav Salunke proposed openstack/openstack-manuals: install: suse: Update neutron service name https://review.openstack.org/181933 | 15:02 |
| openstackgerrit | SHIGEMATSU Mitsuhiro proposed openstack/openstack-manuals: Fix typos from oslo_messaging/_drivers/protocols/amqp/opts.py https://review.openstack.org/182338 | 15:04 |
| dguitarbite | annegentle: hello\ | 15:04 |
| annegentle | dguitarbite: o/ | 15:05 |
| *** sarob has joined #openstack-doc | 15:07 | |
| *** Marga_ has quit IRC | 15:13 | |
| *** patrickeast has joined #openstack-doc | 15:14 | |
| *** berndbausch has quit IRC | 15:26 | |
| dguitarbite | annegentle: training guides team wants to publish upstream training | 15:29 |
| *** steveortiz is now known as zz_steveortiz | 15:29 | |
| dguitarbite | something like the ops guide | 15:30 |
| *** dguitarbite has quit IRC | 15:31 | |
| *** annegentle has quit IRC | 15:32 | |
| pshige | this week's weekly team meeting will be held? | 15:36 |
| *** koolhead17 has joined #openstack-doc | 15:38 | |
| *** koolhead17 has joined #openstack-doc | 15:38 | |
| *** Swami has joined #openstack-doc | 15:42 | |
| *** erikmwil_ has joined #openstack-doc | 15:43 | |
| *** erikmwil_ is now known as erikmwilson_ | 15:43 | |
| *** erikmwilson is now known as Guest28213 | 15:43 | |
| *** erikmwilson_ is now known as erikmwilson | 15:43 | |
| *** erikmwilson_ has joined #openstack-doc | 15:44 | |
| *** zz_steveortiz is now known as steveortiz | 15:51 | |
| *** Marga_ has joined #openstack-doc | 15:54 | |
| *** Marga_ has quit IRC | 16:01 | |
| *** Marga_ has joined #openstack-doc | 16:01 | |
| *** openstackgerrit_ has quit IRC | 16:11 | |
| openstackgerrit | Sam Betts proposed openstack/openstack-manuals: Update PD section to mention plugin configuration https://review.openstack.org/182373 | 16:15 |
| reed | hello folks | 16:16 |
| *** pm90_ has joined #openstack-doc | 16:18 | |
| openstackgerrit | Sam Betts proposed openstack/openstack-manuals: Update PD section to include dhcpv6_pd_agent info https://review.openstack.org/182375 | 16:18 |
| *** ildikov has quit IRC | 16:19 | |
| *** Marga_ has quit IRC | 16:21 | |
| *** Marga_ has joined #openstack-doc | 16:22 | |
| *** pm90_ has quit IRC | 16:27 | |
| *** pm90_ has joined #openstack-doc | 16:28 | |
| *** Marga_ has quit IRC | 16:28 | |
| *** Marga_ has joined #openstack-doc | 16:28 | |
| *** annegentle has joined #openstack-doc | 16:36 | |
| *** annegentle has quit IRC | 16:41 | |
| *** jpena has quit IRC | 16:43 | |
| *** patrickeast has quit IRC | 16:44 | |
| *** emagana has quit IRC | 16:48 | |
| *** sayan has joined #openstack-doc | 16:49 | |
| *** emagana has joined #openstack-doc | 16:50 | |
| *** emagana has quit IRC | 17:02 | |
| *** shaunm_ has quit IRC | 17:02 | |
| *** jogo has quit IRC | 17:02 | |
| *** emagana has joined #openstack-doc | 17:02 | |
| *** jogo has joined #openstack-doc | 17:02 | |
| *** shaunm_ has joined #openstack-doc | 17:03 | |
| *** Marga_ has quit IRC | 17:18 | |
| openstackgerrit | Diane Fleming proposed openstack/api-site: Fix list extensions and get extension calls for Compute v2 https://review.openstack.org/181140 | 17:24 |
| *** patrickeast has joined #openstack-doc | 17:25 | |
| *** Marga_ has joined #openstack-doc | 17:28 | |
| *** pc_m has quit IRC | 17:31 | |
| *** annegentle has joined #openstack-doc | 17:37 | |
| *** sc68cal has quit IRC | 17:38 | |
| *** sc68cal has joined #openstack-doc | 17:39 | |
| *** sc68cal has quit IRC | 17:39 | |
| *** sc68cal has joined #openstack-doc | 17:39 | |
| openstackgerrit | Diane Fleming proposed openstack/api-site: Add API Documentation for Vlan Transparency Extension https://review.openstack.org/181195 | 17:42 |
| *** annegentle has quit IRC | 17:42 | |
| *** chlong has quit IRC | 17:46 | |
| *** pc_m has joined #openstack-doc | 17:47 | |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: install: suse: Update neutron service name https://review.openstack.org/181933 | 17:53 |
| *** chlong has joined #openstack-doc | 17:59 | |
| *** jogo has quit IRC | 18:11 | |
| *** amotoki_ has quit IRC | 18:15 | |
| *** MasterPiece has quit IRC | 18:28 | |
| openstackgerrit | Diane Fleming proposed openstack/api-site: Fix list extensions and get extension calls for Compute v2 https://review.openstack.org/181140 | 18:33 |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: User Guides: Remove user_only and orphan https://review.openstack.org/182404 | 18:34 |
| * AJaeger loves some cleanup like the patch above ^ | 18:34 | |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: End User Guide: Remove user_only and orphan https://review.openstack.org/182404 | 18:41 |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: Admin User Guide: Remove admin_only https://review.openstack.org/182406 | 18:41 |
| *** sicarie has joined #openstack-doc | 18:41 | |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: Update transifex config for User Guide split https://review.openstack.org/182407 | 18:48 |
| *** puranamr has joined #openstack-doc | 18:50 | |
| *** pm90_ has quit IRC | 18:54 | |
| *** matjazp has joined #openstack-doc | 18:57 | |
| *** matjazp has quit IRC | 19:04 | |
| *** ildikov has joined #openstack-doc | 19:05 | |
| openstackgerrit | Claudiu Belu proposed openstack/openstack-manuals: Adds documentation for Hyper-V Generation 2 VMs https://review.openstack.org/182033 | 19:14 |
| *** openstackgerrit_ has joined #openstack-doc | 19:16 | |
| openstackgerrit | Merged openstack/api-site: Add API Documentation for Vlan Transparency Extension https://review.openstack.org/181195 | 19:20 |
| openstackgerrit | Michael Simo proposed openstack/security-doc: Fix grammatical errors in security-guide/networking-services https://review.openstack.org/178016 | 19:22 |
| sicarie | Hello, I'm having a 'patch in merge conflict' issue and I can't seem to determine how to resolve in git | 19:25 |
| openstackgerrit | Michael Simo proposed openstack/security-doc: Fix grammatical errors in security-guide/networking-services https://review.openstack.org/178016 | 19:25 |
| *** openstackgerrit_ has quit IRC | 19:25 | |
| sicarie | Would someone be able to take a look at: https://review.openstack.org/#/c/181449/ and point me in the right direction? | 19:26 |
| *** annegentle has joined #openstack-doc | 19:31 | |
| AJaeger | sicarie: do the following: | 19:44 |
| AJaeger | git checkout master | 19:44 |
| AJaeger | git pull | 19:44 |
| AJaeger | git review -d 181449 | 19:44 |
| AJaeger | git rebase origin/master | 19:44 |
| AJaeger | and resolve the conflict locally and then run git add FILE-with-conflicts | 19:45 |
| AJaeger | git rebase --continue | 19:45 |
| AJaeger | git review | 19:45 |
| AJaeger | the tricky part is resolving the conflict, google should help you with that | 19:45 |
| sicarie | Haha, I was just about to ask | 19:45 |
| sicarie | AJaeger thanks! | 19:45 |
| AJaeger | Basically their's the content in master and the content in your change separated by | 19:45 |
| AJaeger | >>> HEAD | 19:45 |
| AJaeger | master | 19:45 |
| AJaeger | ================ | 19:45 |
| AJaeger | your change | 19:45 |
| AJaeger | <<<<<<<<<<<<<<< | 19:46 |
| annegentle | sicarie: I use git status after git rebase origin/master to get a list of files to look at | 19:46 |
| AJaeger | (something like that) | 19:46 |
| AJaeger | Yeah, git status is nice | 19:46 |
| annegentle | sicarie: then I can copy and paste the path/to/file for the git add command once I've resolved the >>> HEAD conflicts | 19:46 |
| AJaeger | sicarie: so, edit the file so that the content looks fine again, this means looking closely at the difference between those and editing | 19:47 |
| AJaeger | annegentle: do you have any further questions for my user guides patch series? | 19:47 |
| sicarie | AJaeger: it looks like it's trying to put the first line of my commit message into the section_introduction_to_case_studies | 19:48 |
| AJaeger | sicarie: if it fails completely, somebody can take over and resolve for you. But give it a try and learn it... | 19:48 |
| sicarie | Can I just delete the line (as it's unnecessary)? | 19:48 |
| AJaeger | sicarie: yes, to show you what has changed | 19:48 |
| AJaeger | sicarie: you should delete that line and all the others that are not needed until the complete file looks as it should look like | 19:49 |
| AJaeger | sicarie: for me it starts with: | 19:49 |
| AJaeger | <<<<<<< HEAD | 19:49 |
| AJaeger | content in master | 19:49 |
| AJaeger | ============= | 19:49 |
| AJaeger | your change | 19:49 |
| AJaeger | >>>>>>> Updating Alice's case studies for intro, communication, and docs | 19:49 |
| annegentle | AJaeger: oh so you think there may be other side effects for linking. but links are to files? | 19:50 |
| AJaeger | so, figure out what has changed in master after you did the edit, merge that change into your own text and remove master and the markers | 19:50 |
| AJaeger | annegentle: links are to a directory | 19:50 |
| annegentle | AJaeger: ah. | 19:50 |
| AJaeger | annegentle: If I move the RST files into the existing doc/common where we have XML files, it might have side effects | 19:50 |
| AJaeger | I wanted to have the XML and RST files in separate dirs... | 19:50 |
| AJaeger | sicarie: run git log on the file to see the last change that introduced the conflict - together with the patch like | 19:51 |
| AJaeger | git log -p security-guide/section_introduction-to-case-studies.xml | 19:51 |
| AJaeger | This will show you the following diff: | 19:52 |
| AJaeger | - the internet: its API endpoints, compute instances, and other | 19:52 |
| AJaeger | + the Internet: its API endpoints, compute instances, and other | 19:52 |
| annegentle | AJaeger: so, looking to the future, will you then rename common-rst to common once everything is rst? | 19:52 |
| AJaeger | sicarie: since your text does not include internet anymore, just remove the master paragraph. | 19:52 |
| AJaeger | annegentle: that's something we could do indeed. | 19:53 |
| AJaeger | And since we link the files locally in the dirs with the name common, we would not need to change a single file - just update the links ;) | 19:53 |
| AJaeger | I haven't thought that far | 19:53 |
| annegentle | ok thinking... | 19:54 |
| *** KLevenstein has quit IRC | 19:54 | |
| annegentle | I know symlinks add a level of redirection that lots of people approaching the repo won't know. But anyone who works on specs will know. hm | 19:54 |
| AJaeger | annegentle: did you see my cleanup patch: https://review.openstack.org/182406 ? That separation makes it much nicer... | 19:54 |
| AJaeger | annegentle: it wouldn't cause any harm, they can just open doc/user-guide/source/common/SOME_FILE.rst and it will work | 19:55 |
| annegentle | AJaeger: yes I like the removal of the ..meta directives, just trying to get my head around symlinks :) | 19:55 |
| AJaeger | ;) | 19:55 |
| annegentle | AJaeger: so why continue to use tags when building? | 19:56 |
| AJaeger | annegentle: I haven't done that cleanup patch yet ;) | 19:56 |
| AJaeger | first want to get the current patches in - and then we can remove these again... | 19:56 |
| AJaeger | AFter those two cleanup patches, we won't need them anymore. | 19:56 |
| annegentle | AJaeger: ah, ok | 19:57 |
| * AJaeger has a stack of 7 patches now - that's enough ;) | 19:57 | |
| annegentle | AJaeger: so, as long as a symlink exists, the index.rst "finds" the glossary.rst | 19:57 |
| AJaeger | My two open todos for the stack are: | 19:57 |
| AJaeger | * Remove user_only, admin_only everywhere, incl doc-tools. | 19:57 |
| AJaeger | * Remove sphinx extension. | 19:57 |
| openstackgerrit | Nathaniel Dillon proposed openstack/security-doc: Updating Alice's case studies for intro, communication, and docs https://review.openstack.org/181449 | 19:57 |
| AJaeger | annegentle: correct | 19:57 |
| annegentle | AJaeger: got it | 19:57 |
| AJaeger | sicarie: Congrats on your rebase, looks fine! | 19:59 |
| sicarie | AJaeger: hmmm, still a bit hazy - I was positive I caught that i | 20:00 |
| AJaeger | sicarie: make another round ;) You mastered rebased and conflicts now :) | 20:00 |
| sicarie | Yeah, it's also missing the RC4 updates | 20:00 |
| sicarie | AJaeger: thanks! I'll do another patch on this | 20:00 |
| AJaeger | thanks, sicarie ! | 20:01 |
| AJaeger | annegentle, https://review.openstack.org/#/q/status:open+topic:separate-user-guide,n,z is the complete patch series | 20:01 |
| AJaeger | annegentle: consider just checking out the following to see the current top of the stack: https://review.openstack.org/#/c/182407/ | 20:02 |
| annegentle | AJaeger: yep, hafta get to TC meeting | 20:02 |
| AJaeger | annegentle: sure - thanks for the reviews! | 20:03 |
| *** pm90_ has joined #openstack-doc | 20:03 | |
| openstackgerrit | Nathaniel Dillon proposed openstack/security-doc: Updating Alice's case studies for intro, communication, and docs https://review.openstack.org/181449 | 20:05 |
| *** KLevenstein has joined #openstack-doc | 20:07 | |
| *** KLevenstein has quit IRC | 20:19 | |
| *** KLevenstein has joined #openstack-doc | 20:19 | |
| *** JRobinson__ has joined #openstack-doc | 20:21 | |
| openstackgerrit | Andreas Jaeger proposed openstack/openstack-manuals: Remove RST tags user_only and admin_only https://review.openstack.org/182444 | 20:24 |
| *** openstackgerrit has quit IRC | 20:37 | |
| *** openstackgerrit has joined #openstack-doc | 20:37 | |
| *** pm90_ has quit IRC | 20:39 | |
| *** pm90_ has joined #openstack-doc | 20:40 | |
| openstackgerrit | Merged openstack/security-doc: Fix grammatical errors in security-guide/networking-services https://review.openstack.org/178016 | 20:42 |
| *** koolhead17 has quit IRC | 20:50 | |
| *** erikmwilson has quit IRC | 21:07 | |
| *** stevemar has quit IRC | 21:08 | |
| *** annegentle has quit IRC | 21:10 | |
| *** MasterPiece has joined #openstack-doc | 21:11 | |
| *** pc_m has quit IRC | 21:16 | |
| *** JRobinson__ is now known as JRobinson__afk | 21:24 | |
| *** chlong has quit IRC | 21:24 | |
| *** emagana has quit IRC | 21:30 | |
| *** emagana has joined #openstack-doc | 21:30 | |
| *** erikmwilson_ is now known as erikmwilson | 21:30 | |
| *** asettle has joined #openstack-doc | 21:30 | |
| *** mattfarina has quit IRC | 21:35 | |
| *** adahms has joined #openstack-doc | 21:37 | |
| *** salv-orlando has quit IRC | 21:42 | |
| *** ildikov has quit IRC | 21:45 | |
| *** Piet has joined #openstack-doc | 21:46 | |
| *** annegentle has joined #openstack-doc | 21:50 | |
| *** pm90_ has quit IRC | 21:50 | |
| *** JRobinson__afk is now known as JRobinson__ | 21:55 | |
| *** bmoss has joined #openstack-doc | 21:57 | |
| *** ildikov has joined #openstack-doc | 22:01 | |
| *** Swami has quit IRC | 22:02 | |
| *** Marga__ has joined #openstack-doc | 22:09 | |
| *** bogdando has quit IRC | 22:10 | |
| *** Marga_ has quit IRC | 22:10 | |
| openstackgerrit | Nathaniel Dillon proposed openstack/security-doc: Updating Alice's case study for Networking https://review.openstack.org/182064 | 22:12 |
| *** jecarey has quit IRC | 22:13 | |
| *** sicarie has quit IRC | 22:35 | |
| *** dnavale has joined #openstack-doc | 22:36 | |
| annegentle | dhellmann: hey, just talked to Stefano about the blog, and anyone can have a login, he can hook you up. All the posts are aggregated to planet.openstack. There's also a new openstack.org/news but we don't think it can be aggregated to planet. | 22:42 |
| *** salv-orlando has joined #openstack-doc | 22:43 | |
| *** salv-orlando has quit IRC | 22:46 | |
| *** KLevenstein has quit IRC | 22:50 | |
| *** furface has joined #openstack-doc | 22:54 | |
| *** Swami has joined #openstack-doc | 22:57 | |
| *** pm90_ has joined #openstack-doc | 22:57 | |
| *** pm90_ has quit IRC | 22:58 | |
| *** pm90_ has joined #openstack-doc | 22:58 | |
| *** emagana has quit IRC | 23:06 | |
| *** chlong has joined #openstack-doc | 23:15 | |
| *** annegentle has quit IRC | 23:17 | |
| openstackgerrit | Merged openstack/docs-specs: Spec: Color support for osbash https://review.openstack.org/144635 | 23:17 |
| *** Marga__ has quit IRC | 23:17 | |
| *** Marga_ has joined #openstack-doc | 23:18 | |
| *** j1mc has joined #openstack-doc | 23:24 | |
| *** Marga_ has quit IRC | 23:25 | |
| *** Marga_ has joined #openstack-doc | 23:26 | |
| openstackgerrit | Merged openstack/openstack-manuals: Remove passive voice from chap 5, arch guide https://review.openstack.org/180881 | 23:30 |
| *** steveortiz is now known as zz_steveortiz | 23:32 | |
| openstackgerrit | Merged openstack/openstack-manuals: install: suse: Update neutron service name https://review.openstack.org/181933 | 23:36 |
| openstackgerrit | Wayne Okuma proposed openstack/api-site: Add documentation for Glance Metadata Definitions Catalog - Tags https://review.openstack.org/182037 | 23:43 |
| *** pm90_ has quit IRC | 23:55 | |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!