Saturday, 2013-09-07

lifelesswhats the current number of contributing companies? ATC's is ~1K...00:05
clarkblifeless: stackalytics and bitergia have those numbers00:05
clarkbhttp://stackalytics.com/ and I always forget the other one00:05
lifelesshuh they claim only 100 companies...00:06
clarkblifeless: http://activity.openstack.org/dash/browser/00:08
pleia2http://activity.openstack.org/ has a couple stats things (dash is the bitergia one)00:09
pleia2yeah, that00:09
pleia2http://activity.openstack.org/data/display/OPNSTK2/Organizations is the orgs though00:10
*** jhesketh_ has quit IRC00:17
*** nati_ueno_2 has joined #openstack-infra00:17
anteayais the activity board what mrmartin is working on?00:22
pleia2maybe, reed has been working on it, not sure who else00:22
reedanteaya, no, mrmartin is working on groups site00:23
anteayaany idea who is working on the activity board?00:23
reedanteaya, me :)00:23
flashgordonjeblair: a bad one?00:23
reedanteaya, wazzup?00:24
anteayapm'd00:25
flashgordonjeblair: I picked ones that were nova related or test related nova,novaclient,devstack,d-g,tempest,heat (not sure why)00:25
flashgordonnot sure about heat though00:25
reedi think it's beer o'clock00:25
flashgordonI think i just looked for any case of cells test00:26
reedbye folks00:26
*** gyee has quit IRC00:26
anteayabye reed00:26
*** reed has quit IRC00:26
*** rcleere has joined #openstack-infra00:27
*** salv-orlando has quit IRC00:28
anteayaI'm unplugging for the evening00:30
pleia2have a good one00:30
anteayathanks you too00:30
flashgordonlifeless: https://www.ohloh.net/p/openstack is pretty good as well for stats00:31
harlowjahey, qq, that i was wondering about zuul and all that, is the thing that dynamially provisions openstack using openstack itself to deploy?00:32
harlowja*dynamically provisions workers for tests i mean00:32
clarkbharlowja: all of our slaves run on two openstack clouds (rackspace and hpcloud), nodepool (the thing that dynamically provisions them) provisions nodes with novaclient00:33
harlowjasweet00:33
harlowjaneats00:33
*** anteaya has quit IRC00:34
*** UtahDave has quit IRC00:35
*** stevebaker_ has quit IRC00:37
*** pcrews has joined #openstack-infra00:42
flashgordonis there any way to list all the historic 'recheck no bug' jobs00:43
jeblairflashgordon: ok, we probably want to add it to all projects with gate-tempest-devstack-vm for the check/gate pipeline, but it doesn't really matter for the silent pipeline00:43
flashgordonjeblair: should I put it on everything now or when we move off the silent pipeline?00:43
*** svarnau has quit IRC00:44
jeblairflashgordon: either way; it's getting to be around the time on friday afternoon i'm reluctant to approve config changes, but one of us still might approve it if we're around this weekend.00:45
flashgordonjeblair: I won't touch it because I am at the same point00:45
flashgordonthanks00:45
flashgordonjeblair: and for listing recheck no bug jobs?00:49
clarkbflashgordon: I don't think we keep historical data in the rechecks pickle00:51
clarkbflashgordon: we could probably update that script to talk to graphite though, or do a query on the gerrit DB00:52
flashgordonclarkb: I was going to spot check for a bug https://bugs.launchpad.net/nova/+bug/122198700:53
uvirtbotLaunchpad bug 1221987 in nova "compute node heartbeat out of sync causing scheduler to fail in devstack" [Undecided,New]00:53
flashgordonmaybe can do that with logstash foo00:53
flashgordonof which I hvae one00:53
clarkbwith logstash you can search for the fails, but we aren't feeding in actual recheck data00:53
flashgordoncan I search for a n-sched log msg?00:54
clarkbyup00:54
clarkbflashgordon: what is the message? I will write a query00:54
flashgordon"is disabled or has not been heard from in a while "00:54
flashgordonclarkb: thanks ☃00:55
clarkbflashgordon: I am not seeing that over the last 12 hours. Can you link to the string in logs.openstack.org?00:56
clarkboh its a DEBUG level log00:56
flashgordonhttp://logs.openstack.org/97/45497/2/check/gate-tempest-devstack-vm-postgres-full/084442d/logs/screen-n-sch.txt.gz#_2013-09-07_00_06_14_88000:56
flashgordon*nod*00:56
clarkbwe are no longer indexing those because ETOOMANYLOGLINES00:57
clarkbflashgordon: does the warning below it correspond to the same thing? we can search for that00:57
flashgordonthis may be good enough http://logs.openstack.org/97/45497/2/check/gate-tempest-devstack-vm-postgres-full/084442d/logs/screen-n-sch.txt.gz#_2013-09-07_00_06_14_88000:57
flashgordonits a warning00:57
flashgordonyeah although that can be for other issues to00:57
flashgordonbut close enough for now00:57
*** dims has quit IRC00:57
*** nati_ueno has quit IRC01:00
*** nati_ueno_2 has quit IRC01:00
*** nati_ueno has joined #openstack-infra01:01
clarkbtrying to narrow the search down a bit as you are right there are other instances of it01:02
flashgordonclarkb: oh got it working  '"Setting instance to ERROR state" AND @fields.filename:"logs/screen-n-sch.txt"01:02
*** rcleere has quit IRC01:02
clarkbyeah but that gets a lot of stuff (which may be fine01:03
clarkbI am trying to sort out a better query, yay lucene01:03
*** svarnau has joined #openstack-infra01:03
flashgordonfound another case of the bug http://logs.openstack.org/93/45493/2/check/gate-tempest-devstack-vm-postgres-full/f879c8a/logs/screen-n-sch.txt.gz01:03
*** svarnau has quit IRC01:03
flashgordonhmm its always postgres01:04
clarkbflashgordon: not always, but postgres seems to be more frequent01:04
flashgordonnope thats a lie01:05
flashgordonerr your right01:05
clarkb@tags:"logs/screen-n-sch.txt" AND @message:"Setting instance to ERROR state" AND @fields.build_name:"gate-tempest-devstack-vm-full"01:05
*** nati_ueno has quit IRC01:05
flashgordonbtw having these logs searchable is badass01:05
clarkb:) sometimes it feels like getting to this point has been far too much work so hearing that is good01:06
flashgordonwow 98 times in last 4 hours01:06
flashgordonmost of those were one job though?01:08
clarkblooks like 53 in one job01:10
clarkbthis reminds me I need to put job uuid in the fields now that we have mutliple master01:10
*** nati_ueno has joined #openstack-infra01:12
*** dims has joined #openstack-infra01:13
*** flaper87 is now known as flaper87|afk01:14
flashgordonif I mark bugs a duplicates does recheck figure that out?01:14
clarkbflashgordon: it does not01:15
flashgordonclarkb: because many people just say which test failed and for something like that that is useless01:15
flashgordonclarkb: how hard of a change would that be?01:15
clarkbprobably not too bad since I think you can look that up in LP01:15
clarkbso each time the html is generated combine dupes01:15
flashgordonaka I will take a stab of you point me in the right direction01:16
clarkbflashgordon: http://git.openstack.org/cgit/openstack-infra/config/tree/modules/recheckwatch/files/recheckwatch01:16
clarkbit is super simple in its current state01:17
clarkbflashgordon: @tags:"logs/screen-n-sch.txt" AND @message:(tempest* AND "Setting instance to ERROR state")01:19
flashgordonclarkb: lookin now01:19
clarkbfinally figured out lucene grouping and wildcards...01:19
clarkbthat query should give you a significantly narrower set of results01:20
flashgordonyeah I see 60 in 24 hours01:20
flashgordonlooks right01:20
clarkbquoting tempest* makes it not work and I have no idea why01:21
clarkbI think when you quote it makes it look for very specific things01:22
clarkband might escape the *01:22
flashgordoncan I run recheck watch locally?01:22
clarkbyes I think so, it feeds off the gerrit event stream which you can access with your gerrit ssh credentials01:23
clarkbif you point it at review-dev you can even recheck things all you want01:23
flashgordonrecheck-dev?01:24
clarkbflashgordon: review-dev is our test gerrit server, you can create an account on it and do $things01:24
clarkbflashgordon: or use the test project on review.o.o01:24
flashgordonahh you are few steps aheadof me01:25
clarkbflashgordon: http://git.openstack.org/cgit/openstack-infra/config/tree/modules/recheckwatch/files/recheckwatch#n107 just make sure that line is pointed at the server you want with your credentials and you should be able to run it locally01:25
flashgordonawesome01:26
clarkbflashgordon: http://git.openstack.org/cgit/openstack-infra/config/tree/modules/recheckwatch/templates/recheckwatch.conf.erb is the example conf file01:26
flashgordonI am still getting deps installed01:27
flashgordondidn't see a requirements file01:28
*** nati_ueno has quit IRC01:29
*** stevebaker_ has joined #openstack-infra01:29
clarkbflashgordon: there isn't one, it hasn't grown into its own project... we have a (bad) habit of bootstrapping stuff in the puppet repo and when they grow large enough turning them into proper projects01:29
*** nati_ueno has joined #openstack-infra01:29
flashgordongah01:30
*** nati_ueno has joined #openstack-infra01:30
flashgordon    import daemon.pidfile01:30
flashgordonbarfs for me on no mod named pidfile01:31
*** stevebaker_ has quit IRC01:31
*** stevebaker_ has joined #openstack-infra01:31
clarkbflashgordon: pip install python-daemon (that is the name of the debian/ubuntu package if you want ot install that way)01:31
flashgordonI tried pip install daemon01:32
clarkbhttps://pypi.python.org/pypi/python-daemon/01:32
clarkbits a package that is slightly annoying becuase of its lockfile stuff that changed (note the import exception handling around that)01:33
clarkbalso no python 3 support despite being written by the person that proposed the pep for python 3...01:33
clarkbbut it does a thing that is useful :) I have code that works with python 3 somewhere but it takes a few shortcuts01:34
flashgordonhmm conf file didn't work for my01:36
flashgordonI ran'python recheckwatch conf ' and nothing01:37
clarkbI would pass it the -n flag. I think it is trying to daemonize01:37
clarkband it might have (check ps)01:38
flashgordonheh I have to do -n after the config file01:42
*** sarob has quit IRC01:50
*** dkliban has joined #openstack-infra01:59
*** ryanpetrello has quit IRC02:00
*** stevebaker_ has quit IRC02:04
*** stevebaker_ has joined #openstack-infra02:06
openstackgerritJoe Gordon proposed a change to openstack-infra/config: Merge duplicate bugs in recheckwatch  https://review.openstack.org/4551102:10
flashgordonuntested POC ^02:10
*** stevebaker_ has quit IRC02:15
*** dims has quit IRC02:16
*** stevebaker_ has joined #openstack-infra02:29
*** dkliban has quit IRC02:42
*** rcleere has joined #openstack-infra02:43
*** stevebaker_ has quit IRC02:47
*** stevebaker_ has joined #openstack-infra02:49
*** ArxCruz has quit IRC03:07
*** stevebaker_ has quit IRC03:23
*** nati_ueno has quit IRC03:42
*** nati_ueno has joined #openstack-infra03:43
*** nati_ueno has quit IRC03:47
*** stevebaker_ has joined #openstack-infra03:55
*** nati_ueno has joined #openstack-infra04:12
*** nati_ueno has quit IRC04:27
*** nati_ueno has joined #openstack-infra04:28
openstackgerritA change was merged to openstack-dev/pbr: Add a hint for users who don't have git installed.  https://review.openstack.org/4550204:31
*** nati_ueno has quit IRC04:32
*** stevebaker_ has quit IRC04:34
*** nati_ueno has joined #openstack-infra04:35
*** vogxn has joined #openstack-infra04:46
*** stevebaker_ has joined #openstack-infra04:48
*** Ryan_Lane has quit IRC04:48
*** Ryan_Lane has joined #openstack-infra04:49
*** dklyle has joined #openstack-infra04:58
*** blamar has quit IRC04:59
*** david-lyle has quit IRC04:59
*** zaro has quit IRC04:59
*** Daviey has quit IRC04:59
*** soren has quit IRC04:59
*** dkehn_ has joined #openstack-infra04:59
*** krtaylor has quit IRC05:00
*** soren has joined #openstack-infra05:00
*** krtaylor has joined #openstack-infra05:01
*** Daviey has joined #openstack-infra05:01
*** dkehn has quit IRC05:03
*** nati_uen_ has joined #openstack-infra05:04
openstackgerritClint Byrum proposed a change to openstack-infra/config: Grant tripleo-ptl tags on tripleo-image-elements  https://review.openstack.org/4551805:05
*** stevebaker_ has quit IRC05:06
*** dkliban has joined #openstack-infra05:21
*** thomasbiege has joined #openstack-infra05:27
*** thomasbiege has quit IRC05:30
*** nati_ueno has quit IRC05:31
*** nati_ueno has joined #openstack-infra05:38
*** thomasbiege has joined #openstack-infra06:06
*** thomasbiege has quit IRC06:07
*** thomasbiege has joined #openstack-infra06:07
*** nati_uen_ has quit IRC06:16
*** nati_uen_ has joined #openstack-infra06:16
*** nati_ueno has quit IRC06:17
*** thomasbiege has quit IRC06:17
*** nati_ueno has joined #openstack-infra06:17
*** nati_ueno has quit IRC06:22
*** nati_ueno has joined #openstack-infra06:35
*** nati_ueno has quit IRC06:39
*** nati_ueno has joined #openstack-infra06:40
*** HenryG has quit IRC06:41
*** nati_ueno has quit IRC06:44
*** zaro has joined #openstack-infra06:57
*** UtahDave has joined #openstack-infra06:58
*** UtahDave has quit IRC07:04
*** UtahDave has joined #openstack-infra07:06
*** nati_ueno has joined #openstack-infra07:11
*** boris-42 has joined #openstack-infra07:16
*** Ryan_Lane has quit IRC07:20
*** nati_ueno has quit IRC07:24
*** nati_ueno has joined #openstack-infra07:25
*** nati_ueno has quit IRC07:29
*** Guest63959 is now known as Vivek07:38
*** Vivek is now known as Guest3850507:38
*** Guest38505 is now known as Vivek07:40
*** Vivek has joined #openstack-infra07:40
*** michchap has joined #openstack-infra07:47
*** vogxn has quit IRC07:48
*** vogxn has joined #openstack-infra08:01
*** gaelL has quit IRC08:04
*** gaelL has joined #openstack-infra08:08
*** nati_uen_ has quit IRC08:11
*** dkliban has quit IRC08:17
*** amotoki has quit IRC09:23
*** UtahDave has quit IRC09:53
*** enikanorov-w has quit IRC09:54
*** enikanorov-w has joined #openstack-infra09:55
*** amotoki has joined #openstack-infra10:26
*** salv-orlando has joined #openstack-infra10:56
*** thomasbiege has joined #openstack-infra11:16
*** thomasbiege has quit IRC11:17
*** thomasbiege1 has joined #openstack-infra11:38
*** thomasbiege2 has joined #openstack-infra11:39
*** thomasbiege2 has quit IRC11:39
*** thomasbiege1 has quit IRC11:41
*** vogxn has quit IRC11:58
*** dkehn_ has quit IRC12:25
*** thomasbiege1 has joined #openstack-infra12:53
*** thomasbiege1 has quit IRC12:55
*** thomasbiege1 has joined #openstack-infra13:16
*** sdague has quit IRC13:21
*** thomasbiege1 has quit IRC13:29
*** thomasbiege1 has joined #openstack-infra13:35
*** sdague has joined #openstack-infra13:37
*** thomasbiege1 has quit IRC13:40
*** yaguang has joined #openstack-infra13:52
*** dkliban has joined #openstack-infra13:54
*** dims has joined #openstack-infra14:04
*** erfanian has joined #openstack-infra14:06
*** HenryG has joined #openstack-infra14:07
*** sdague_ has joined #openstack-infra14:11
*** sdague has quit IRC14:13
*** sdague_ is now known as sdague14:13
*** yaguang has quit IRC14:26
*** dkehn has joined #openstack-infra14:32
*** anteaya has joined #openstack-infra14:36
*** sdague has quit IRC14:38
*** sdague has joined #openstack-infra15:05
*** thomasbiege1 has joined #openstack-infra15:07
openstackgerritJames E. Blair proposed a change to openstack-infra/zuul: Use NNFI scheduler algorithm  https://review.openstack.org/4533415:09
*** thomasbiege1 has quit IRC15:19
*** dims has quit IRC15:21
*** dims has joined #openstack-infra15:24
*** adalbas has joined #openstack-infra15:25
boris-42jblair hi15:25
boris-42jeblair hi*15:26
*** michchap has quit IRC15:58
*** adalbas has quit IRC15:59
*** CaptTofu has quit IRC16:02
*** jhesketh has quit IRC16:04
*** dims has quit IRC16:10
*** thomasbiege1 has joined #openstack-infra16:14
*** dims has joined #openstack-infra16:14
*** jhesketh has joined #openstack-infra16:17
*** erfanian has quit IRC16:18
*** nati_ueno has joined #openstack-infra16:19
*** dims has quit IRC16:19
*** dims has joined #openstack-infra16:20
*** nati_ueno has quit IRC16:20
*** nati_ueno has joined #openstack-infra16:22
*** odyssey4me has joined #openstack-infra16:25
*** nati_ueno has quit IRC16:30
*** pcrews has quit IRC16:40
*** thomasbiege1 has quit IRC16:43
*** odyssey4me has quit IRC16:43
*** odyssey4me has joined #openstack-infra16:44
*** chuck_ has joined #openstack-infra16:58
*** nati_ueno has joined #openstack-infra17:04
*** nati_ueno has quit IRC17:06
*** CaptTofu has joined #openstack-infra17:07
*** CaptTofu has quit IRC17:09
*** CaptTofu has joined #openstack-infra17:10
*** chuck_ has quit IRC17:19
*** dkliban has quit IRC17:47
SpamapS /win 1618:01
annegentlejeblair: clarkb: fungi: just to give an update on our renaming, we're working through what happens with the stable branch builds and want to ensure those keep going.18:16
annegentlejeblair: clarkb: fungi: So Andreas Jaeger will patch my in-progress patch, and Diane is still working on the openstack-manuals patch. Onward!18:16
*** jpeeler has quit IRC18:35
*** blamar has joined #openstack-infra18:47
*** sdake has quit IRC18:55
*** CaptTofu has quit IRC19:03
*** CaptTofu has joined #openstack-infra19:03
openstackgerritAndreas Jaeger proposed a change to openstack-infra/config: Updates user guide and basic install to new directory layout  https://review.openstack.org/4549019:07
openstackgerritAndreas Jaeger proposed a change to openstack-infra/config: Updates user guide and basic install to new directory layout  https://review.openstack.org/4549019:15
*** nati_ueno has joined #openstack-infra19:30
*** ruhe has joined #openstack-infra19:39
openstackgerritAndreas Jaeger proposed a change to openstack-infra/config: Update manual publishing  to new directory layout  https://review.openstack.org/4549019:47
*** mtreinish has quit IRC19:57
*** mtreinish has joined #openstack-infra19:57
*** adalbas has joined #openstack-infra20:00
*** dims has quit IRC20:13
*** dims has joined #openstack-infra20:14
*** nati_ueno has quit IRC20:15
*** nati_ueno has joined #openstack-infra20:16
*** nati_ueno has quit IRC20:18
*** nati_ueno has joined #openstack-infra20:18
*** thomasbiege1 has joined #openstack-infra20:21
*** dims has quit IRC20:25
*** dims has joined #openstack-infra20:26
*** thomasbiege1 has quit IRC20:33
*** flaper87|afk is now known as flaper8720:37
*** dims has quit IRC20:41
*** dims has joined #openstack-infra20:41
*** ruhe has quit IRC20:45
clarkbannegentle: should ^ be approved?20:52
clarkbannegentle: not sure how you want to coordinate these changes20:53
clarkbas an alternative to different jobs for master vs grizzly could the folsom and grizzly branches get updated to the new dir structure as well?20:55
annegentleclarkb: no don't approve yet, I think we still have changes in openstack-manuals to get rid of the docbkx directory20:57
annegentleclarkb: we're also exploring a single pom.xml for all the books, would that be bad for translations or good?20:58
annegentleclarkb: hell to the no on updating old stable20:58
annegentleclark :)20:58
clarkbI am not sure if one pom makes a difference for translations20:58
annegentleclarkb: ok. I'm not sure either. How can we best get translations -- be more consistent?20:59
annegentleget/help20:59
clarkbI am not sure what is meant by that question21:01
clarkbare the translated strings themsevles inconsistent? or the docs that are built with translated strings are inconsistent? and was sort of inconsistency?21:04
annegentleclarkb: wondering about the templatizing you mentioned yesterday21:05
annegentleclarkb: the building isn't consistent21:05
annegentleclarkb: I guess?21:06
clarkboh yes21:06
clarkbannegentle: if you look at manuals.yaml you have each job individually defined and you end up with snowflakes21:06
clarkbannegentle: when you probably have two type of job, build doc in source languages and build doc in some translated language21:07
clarkbannegentle: that entire file could probably be reduced to two job templates21:07
clarkbannegentle: for gate-openstack-manuals-operations-guide the pom is at openstack-ops/pom.xml, for openstack-user-guide the pom is at docbkx/user-guide/pom.xml. They are inconsistent21:08
clarkbif you reorganize everything into the same structure you only need one job template to build both docs21:09
clarkbthough I guess one runs before merge and the other after, so maybe those are bad examples. But that is the type of consistency to consider21:09
clarkbyou don't need one pom.xml, you just need all of your pom.xmls to be in the same place21:10
clarkbeg $DOC_NAME/pom.xml or docbkx/$DOC_NAME/pom.xml21:10
*** nati_ueno has quit IRC21:15
annegentleclarkb: yeah I think what we'll end up with is doc/$DOC_NAME/pom.xml21:16
annegentleclarkb: and I can fix the operations-guide to do doc/$DOC_HAME/pom.xml21:16
clarkbcool21:16
annegentleclarkb: let's make sure we can get the build jobs running by monday, then templatize with $DOC_NAME, does that sound good? (HAME? ha ha ha)21:17
clarkbwfm21:17
openstackgerritAnne Gentle proposed a change to openstack-infra/config: Update manual publishing  to new directory layout  https://review.openstack.org/4549021:24
annegentleclarkb: take a look at that one https://review.openstack.org/45490 and the new structure patch at https://review.openstack.org/#/c/45517/ to make sure they match, we haven't forgotten anything, etc.21:26
*** stevebaker_ has joined #openstack-infra21:26
annegentleclarkb: I'll be at dinner for a bit (eaarrrrly) :) then back online21:26
clarkbannegentle: reviewed. The structure appears to match, I do have comments on 45490 and at least one needs to be addressed21:35
*** Ryan_Lane has joined #openstack-infra21:38
lifelessjeblair: https://review.openstack.org/#/c/44980/5/launch/dns.py21:39
lifelessjeblair: whats your preferred thing there - I can make it a parameter to say whether the tool expects domain21:40
lifelessjeblair: or you could tweak your local patch to that tool to accept domain and ignore it?21:41
*** boris-42 has quit IRC21:42
lifelessjeblair: https://review.openstack.org/#/c/44993/ you and mordred seem to have different opinions about the accuracy/inaccuracy of my docs ;)21:43
lifelessjeblair: can you two please duke it out and tell me what I need to change?21:43
anteayalifeless how did your presentation go?21:48
lifelesswell received21:48
lifelesswill be on youtube soon21:48
anteayayay21:48
anteayahow long until a recording is available?21:48
anteayado you know?21:48
anteayathere you are21:48
anteayayou answered as I asked21:48
anteayagrand21:48
lifelessjeblair: https://review.openstack.org/#/c/45011/ - I didn't think I deleted the API projects stuff; can you point out in the diff, and I'll fix.21:49
*** flaper87 is now known as flaper87|afk21:54
*** stevebaker_ has quit IRC21:56
*** stevebaker_ has joined #openstack-infra21:56
*** stevebaker_ has quit IRC22:07
*** odyssey4me2 has joined #openstack-infra22:32
*** odyssey4me has quit IRC22:34
*** odyssey4me2 has quit IRC22:36
*** stevebaker_ has joined #openstack-infra22:37
*** stevebaker_ has quit IRC22:56
*** zyluo has joined #openstack-infra23:00
*** annegentle has quit IRC23:01
zyluohi, I can't manage to get my patch verified23:01
zyluohttps://review.openstack.org/#/c/41660/23:01
zyluoIts says there is a rebase problem but there is no problem rebasing when done manually23:02
*** CaptTofu has quit IRC23:02
*** CaptTofu has joined #openstack-infra23:02
*** UtahDave has joined #openstack-infra23:05
*** annegentle_ has joined #openstack-infra23:06
*** anteaya has quit IRC23:06
clarkbzyluo: gerrit uses jgit, which often is unable to resolve conflicts as well as Cgit23:08
clarkbzuul approximates what jgit does and I believe that is where the error comes from23:08
clarkbzyluo: you will probably need to rebase. I am willing to bet that for whatever reason the merge strategy that jgit uses cannot resolve mode changes and file edits automatically23:09
zyluoclarkb, got it thanks. I'll rebase and resubmit23:11
*** stevebaker_ has joined #openstack-infra23:16
* fungi has not be overly impressed with jgit's merge strategies23:23
clarkbannegentle_: I am going to run some errands and grab dinner23:35
clarkbwill check IRC after23:35
*** amotoki has quit IRC23:35
*** salv-orlando has quit IRC23:38
annegentle_clarkb: ok I'm patching still23:41
*** salv-orlando has joined #openstack-infra23:42
*** stevebaker_ has quit IRC23:44
*** stevebaker_ has joined #openstack-infra23:45
*** zyluo has quit IRC23:49
*** salv-orlando has quit IRC23:50
openstackgerritAnne Gentle proposed a change to openstack-infra/config: Update manual publishing  to new directory layout  https://review.openstack.org/4549023:55
annegentle_clarkb: ok, take a look at that one ^^23:55

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