Sunday, 2015-08-02

« Saturday, 2015-08-01 Index Monday, 2015-08-03 »
*** pm90_ has quit IRC01:00
openstackgerritKaren Bradshaw proposed openstack/openstack-manuals: [install-guide] keystone-install section  https://review.openstack.org/20556701:16
*** Marga_ has quit IRC01:20
*** Marga_ has joined #openstack-doc01:21
openstackgerritKaren Bradshaw proposed openstack/openstack-manuals: [install-guide] keystone-install section  https://review.openstack.org/20556701:27
*** jmckind has joined #openstack-doc01:45
*** hiddentoken has quit IRC01:49
*** jmckind has quit IRC01:55
*** tedlit has joined #openstack-doc02:20
*** shaunm_ has quit IRC03:07
*** shaunm_ has joined #openstack-doc03:22
*** jmckind has joined #openstack-doc03:40
*** jmckind has quit IRC04:06
*** tedlit has quit IRC05:55
*** Marga_ has quit IRC06:03
openstackgerritOpenStack Proposal Bot proposed openstack/openstack-manuals: Imported Translations from Transifex  https://review.openstack.org/20818806:18
openstackgerritRoger Luethi proposed openstack/training-guides: Wait for floating IP to turn up  https://review.openstack.org/20343907:50
openstackgerritsonu proposed openstack/api-site: Replacing print with print() to provide py 2/3 compatibility  https://review.openstack.org/20819107:57
*** Marga_ has joined #openstack-doc08:36
*** Marga__ has joined #openstack-doc08:39
*** Marga_ has quit IRC08:39
openstackgerritRoger Luethi proposed openstack/training-guides: launch_instance.sh: return error if nova-compute fails  https://review.openstack.org/20819308:50
*** rdo has quit IRC09:49
*** rdo has joined #openstack-doc09:51
*** shaunm_ has quit IRC10:27
*** shaunm_ has joined #openstack-doc10:39
openstackgerritice yao proposed openstack/openstack-manuals: admin-guide-cloud: Add haproxy package to be installed  https://review.openstack.org/20819912:37
*** harry51s has joined #openstack-doc12:48
harry51sOkay, dumb newbie question: I'm trying to submit a patch to the Keystone User's Guide (I did the .rst conversion and I'm cleaning up some syntax errors)12:50
harry51sWhen I run "git review -v", I get the following:12:50
harry51sUsing global/system git-review config files (/etc/git-review/git-review.conf) is deprecated12:50
harry51s2015-08-02 08:40:38.118246 Running: git config --get gitreview.scheme12:50
harry51s2015-08-02 08:40:38.121146 Running: git config --get gitreview.hostname12:50
harry51s2015-08-02 08:40:38.124090 Running: git config --get gitreview.port12:50
harry51s2015-08-02 08:40:38.126907 Running: git config --get gitreview.project12:50
harry51s2015-08-02 08:40:38.129677 Running: git log --color=never --oneline HEAD^1..HEAD12:50
harry51s2015-08-02 08:40:38.135701 Running: git remote12:50
harry51s2015-08-02 08:40:38.139138 Running: git branch -a --color=never12:50
harry51s2015-08-02 08:40:38.142570 Running: git rev-parse --show-toplevel --git-dir12:50
harry51s2015-08-02 08:40:38.145315 Running: git remote update gerrit12:50
harry51sFetching gerrit12:51
harry51s2015-08-02 08:40:42.363748 Running: git rev-parse HEAD12:51
harry51s2015-08-02 08:40:42.367673 Running: git show-ref --quiet --verify refs/remotes/gerrit/master12:51
harry51s2015-08-02 08:40:42.371145 Running: git rebase -p -i remotes/gerrit/master12:51
harry51sErrors running git rebase -p -i remotes/gerrit/master12:51
harry51serror: Commit de809a2d0e0d4035fe11d4c0a8d2b0a557f8210a is a merge but no -m option was given.12:51
harry51sfatal: cherry-pick failed12:51
harry51sCould not pick de809a2d0e0d4035fe11d4c0a8d2b0a557f8210a12:51
harry51sIt is likely that your change has a merge conflict. You may resolve it in the working tree now as described above and then run 'git review' again, or if you do not want to resolve it yet (note that the change can not merge until the conflict is resolved) you may run 'git rebase --abort' then 'git review -R' to upload the change without rebasing.12:51
harry51ssutton@haskvmtrusty:~/devstack/openstack-manuals/doc/install-guide-rst/source$12:51
harry51sI'm new to git and I don't wish to screw anything up here, so guidance would be appreciated12:51
harry51sI don't want to use the -m option without knowing what I'm doing ;-)12:51
*** zul has quit IRC13:43
*** jmckind has joined #openstack-doc13:51
*** shaunm_ has quit IRC14:06
openstackgerritBrant Knudson proposed openstack/openstack-manuals: Add Identity API references to main page  https://review.openstack.org/20820714:24
openstackgerritHarry Sutton proposed openstack/openstack-manuals: [install-guide] add keystone-users section  https://review.openstack.org/20557714:32
harry51sOkay, I figured it out ;-) (I had opened a new branch instead of continuing in the existing branch) Doh!14:32
*** jmckind has quit IRC14:37
*** tedlit has joined #openstack-doc15:00
*** jasondotstar has joined #openstack-doc15:08
*** jmckind has joined #openstack-doc15:19
*** tedlit has quit IRC15:37
*** jasondotstar has quit IRC15:58
*** jasondotstar has joined #openstack-doc16:02
*** jmckind has quit IRC16:17
*** briancline has quit IRC16:36
*** briancline has joined #openstack-doc16:37
*** briancline has quit IRC16:46
*** briancline has joined #openstack-doc16:51
*** jasondotstar has quit IRC17:22
*** harry51s has quit IRC18:15
*** salv-orlando has joined #openstack-doc18:17
openstackgerritRoger Luethi proposed openstack/training-guides: Keep additional logs files  https://review.openstack.org/20822518:25
*** salv-orlando has quit IRC18:47
*** erikmwilson has quit IRC18:56
*** erikmwilson has joined #openstack-doc18:56
*** rbowen has quit IRC19:09
*** _hanhart has quit IRC19:10
*** amandap has quit IRC19:10
*** med_ has quit IRC19:10
*** tomasq has quit IRC19:10
*** blogan has quit IRC19:10
*** blogan has joined #openstack-doc19:11
*** tomasq has joined #openstack-doc19:11
*** med_ has joined #openstack-doc19:11
*** med_ is now known as Guest531419:11
*** amandap has joined #openstack-doc19:13
*** _hanhart has joined #openstack-doc19:15
*** rdo has quit IRC19:17
*** rdo has joined #openstack-doc19:19
*** jasondotstar has joined #openstack-doc19:22
*** tedlit has joined #openstack-doc19:42
*** salv-orlando has joined #openstack-doc19:49
*** tedlit has quit IRC19:54
*** salv-orlando has quit IRC19:57
openstackgerritHarry Sutton proposed openstack/openstack-manuals: [install-guide] add keystone-users section  https://review.openstack.org/20557720:03
*** jasondotstar has quit IRC20:24
openstackgerritHarry Sutton proposed openstack/openstack-manuals: [install-guide] add keystone-users section  https://review.openstack.org/20557720:26
*** salv-orlando has joined #openstack-doc20:57
*** salv-orlando has quit IRC21:06
*** jasondotstar has joined #openstack-doc21:14
*** jasondotstar has quit IRC21:18
*** jasondotstar has joined #openstack-doc21:39
*** JRobinson__ has joined #openstack-doc21:43
*** JRobinson__ has quit IRC21:45
*** JRobinson__ has joined #openstack-doc21:48
*** steveg_afk has quit IRC21:54
*** salv-orlando has joined #openstack-doc22:05
*** jasondotstar has quit IRC22:05
*** salv-orlando has quit IRC22:10
*** salv-orlando has joined #openstack-doc22:10
*** steveg_afk has joined #openstack-doc22:47
*** bmoss has joined #openstack-doc22:55
*** salv-orlando has quit IRC22:56
*** dnavale has joined #openstack-doc23:20
*** furface_afk is now known as furface_23:20
*** patrickeast has joined #openstack-doc23:25
openstackgerritJeffrey Olsen proposed openstack/openstack-manuals: Link to Euca2ools Guide goes to Page Not Found  https://review.openstack.org/20825823:25
*** suyog has joined #openstack-doc23:30
*** puranamr has joined #openstack-doc23:33
*** patrickeast has quit IRC23:34
« Saturday, 2015-08-01 Index Monday, 2015-08-03 »

Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!