Thursday, 2015-04-23

*** ozstacker has joined #openstack-community00:04
*** Marga_ has quit IRC00:11
*** Marga_ has joined #openstack-community00:13
*** Marga_ has quit IRC00:31
*** electroc_ has joined #openstack-community01:08
*** electrocucaracha has quit IRC01:11
*** electrocucaracha has joined #openstack-community01:12
*** electroc_ has quit IRC01:13
*** sarob has quit IRC01:22
*** Marga_ has joined #openstack-community01:49
*** annegentle has joined #openstack-community02:14
*** electrocucaracha has quit IRC02:18
*** annegentle has quit IRC02:19
*** sarob has joined #openstack-community02:41
*** sarob has quit IRC02:43
*** sarob_ has joined #openstack-community02:45
*** sarob_ has quit IRC02:49
*** sarob has joined #openstack-community03:30
*** Marga_ has quit IRC03:50
*** Marga_ has joined #openstack-community03:50
*** coolsvap|afk is now known as coolsvap04:31
*** sarob has quit IRC04:31
*** coolsvap is now known as coolsvap|afk04:32
*** mrmartin has joined #openstack-community04:44
*** jcoufal has joined #openstack-community05:12
*** jcoufal has quit IRC05:15
*** rbowen has quit IRC05:22
*** jcoufal has joined #openstack-community05:25
*** rbowen has joined #openstack-community05:34
*** yfauser has joined #openstack-community05:58
*** yfauser has left #openstack-community05:59
*** jtomasek has joined #openstack-community06:24
*** Marga_ has quit IRC06:31
*** jtomasek has quit IRC06:44
*** neeti has joined #openstack-community07:00
*** jcoufal_ has joined #openstack-community07:07
*** jcoufal has quit IRC07:11
*** jcoufal_ has quit IRC07:15
*** jcoufal has joined #openstack-community07:15
*** jcoufal has quit IRC07:40
*** jcoufal has joined #openstack-community07:41
*** GonZo2K has quit IRC07:45
*** jcoufal has quit IRC07:45
*** coolsvap|afk is now known as coolsvap07:52
*** coolsvap is now known as coolsvap|afk07:53
*** jcoufal has joined #openstack-community07:54
*** GonZo2K has joined #openstack-community08:01
*** dizquierdo has joined #openstack-community08:04
*** jtomasek has joined #openstack-community08:06
*** GonZo2K has quit IRC09:03
*** jcoufal_ has joined #openstack-community09:10
*** jcoufal has quit IRC09:13
*** ozstacker has quit IRC09:37
*** ozstacker has joined #openstack-community09:38
*** jcoufal_ is now known as jcoufal09:55
*** mrmartin has quit IRC10:21
*** inhumanitas has left #openstack-community10:21
*** cdent has joined #openstack-community10:32
*** Harry51S has joined #openstack-community11:20
*** dizquierdo has quit IRC11:57
*** mattgriffin has joined #openstack-community12:00
*** mattgriffin has quit IRC12:07
*** mattgriffin has joined #openstack-community12:08
*** mattgriffin has quit IRC12:09
*** cdent has quit IRC12:13
*** cdent has joined #openstack-community12:14
*** GonZo2K has joined #openstack-community12:18
*** GonZo2K has quit IRC12:18
*** GonZo2K has joined #openstack-community12:18
*** dizquierdo has joined #openstack-community12:21
*** neeti_ has joined #openstack-community12:37
*** neeti has quit IRC12:38
*** tiswanso has joined #openstack-community12:40
*** tiswanso has quit IRC12:45
*** tiswanso has joined #openstack-community12:47
*** tiswanso_ has joined #openstack-community12:51
*** tiswanso has quit IRC12:52
*** sarob has joined #openstack-community13:09
*** Marga_ has joined #openstack-community13:14
*** sarob has quit IRC13:20
*** sarob has joined #openstack-community13:22
*** annegentle has joined #openstack-community13:22
*** neeti_ has quit IRC13:27
*** mattgriffin has joined #openstack-community13:34
*** Marga_ has quit IRC13:52
*** sarob has quit IRC14:30
*** Marga_ has joined #openstack-community14:34
*** Marga_ has quit IRC14:36
*** Marga_ has joined #openstack-community14:37
*** sarob has joined #openstack-community14:52
*** sarob has quit IRC14:58
*** sarob has joined #openstack-community15:00
*** Marga_ has quit IRC15:13
*** Marga_ has joined #openstack-community15:13
*** electrocucaracha has joined #openstack-community15:15
*** Marga_ has quit IRC15:18
*** dizquierdo has quit IRC15:21
*** mwagner_lap has quit IRC16:31
*** jcoufal has quit IRC16:41
*** yfauser has joined #openstack-community16:57
*** yfauser has left #openstack-community16:57
*** GonZo2K has quit IRC17:07
*** Youcef has joined #openstack-community17:09
*** yfauser has joined #openstack-community17:15
*** yfauser has left #openstack-community17:16
*** GonZo2K has joined #openstack-community17:45
*** GonZo2K has quit IRC17:45
*** GonZo2K has joined #openstack-community17:45
*** annegent_ has joined #openstack-community17:46
*** annegentle has quit IRC17:50
*** jehb has quit IRC18:11
*** mrmartin has joined #openstack-community18:25
*** cdent has quit IRC18:27
reedmrmartin, hello18:30
mrmartinhi18:30
reedmrmartin, did you see the comment from fungi and clark?18:30
mrmartinon which review? the pinning one?18:30
reedsince now openid by google is gone, we have already ran out of time18:30
reedyes, pinning18:30
reedwe missed the deadline, we're late and I'm not happy :(18:31
mrmartinyeah, I saw it, they want to create a separate branch18:31
mrmartinwhich deadline?18:31
reedthe advantage is that once there is a feature branch they don't need to approve every change18:31
reedthe deadline for upgrading askbot to a release that supports migration of users from openid google to oauth18:32
mrmartinwhere was that deadline written?18:33
reedI didn't make it clear enough that pinning the theme was time sensitive18:33
reedyou I and evgeny talked about upgrading askbot as soon as possible, but I don't think I nor Evgeny conveyed effectively the urgency of that upgrade18:34
mrmartinYeah, basically my problem here, that the patch was there since april 718:34
reedexactly18:35
reedi never ever thought that a ridicoulously simple patch would be debated for so long18:35
mrmartintoday is april 23, everybody saw the changeset, and we got this two very interesting comments18:35
mrmartinanyway18:35
mrmartinI'm working on this askbot-staging patchset too, and I was talking with Jeremy and Clarkb yesterday and the day before,18:35
reednot only that, but jeremy was on the meeting and he may have been the one suggesting to pin to a commit18:36
reedjust a quick and dirty hack in order to upgrade18:36
mrmartinhow we can do the seamless upgrade between the actuall askbot-puppet that deploys from pip directly18:36
reedmrmartin, so now, let's forget about the deadline, we're screwing google users for a while...18:36
mrmartinand the new askbot-puppet that can brake interface compatibility and deploys askbot-puppet from git repositories18:37
reedcan you quickly send a second patchset with the feature branch thing or shall I insist on just merging that now and you'll fix that later?18:37
mrmartinlet's accept this theme pinning18:38
mrmartinI don't feel that it is so serious thing that infra cannot approve18:38
mrmartinif we are rolling out the askbot-staging, at one point we need also upgrade the ask.o.o to this model18:39
reedthey're concerned that they'll have to approve yet another pinning in two weeks and then another and another18:39
mrmartinaskbot-staging won't contain this pinning thing18:39
mrmartinand if we roll out this github based model to ask.o.o we'll avoid this pinning again18:40
reedbecause the theme will be imported differently?18:40
mrmartinanyway we are doing the same for openstackid releases, and it was not a conern there18:40
mrmartinyes, because we need to deploy from github repository, and it is totally different, because pip downloads a lot of dependencies18:41
mrmartinand repo upgrades both from askbot-devel and askbot-theme must trigger a site structure rebuild18:41
mrmartinso it is different18:42
mrmartinand pip deployment also seems to be broken for me, I was testing that locally, and it had some dependency problem, I need to recheck whether it was a network connectivity issue or something else18:43
mrmartinclark's notice sounds great, if we are following a single project, but the askbot-devel is out of infra18:44
mrmartinand we cannot do gating there18:44
reedwhat do you mean?18:45
reedoh, I see18:45
mrmartinthat is the core of the problem, that we have a wonderful CI/CD system, but if a project lives outside our infra18:45
mrmartinwe cannot trigger events, do gating18:45
mrmartinso on an usual project clarkb's arguments are perfect, but this askbot is a very special case18:46
mrmartinwe are consuming software from two different source, where we don't have a control over the testing / gating18:47
mrmartinand any change in both source must trigger a complete rebuild of the django stack18:47
mrmartinusing prepackaged softwares from a debian repository can be an ultimate solution here, but we don't have the processes and packaging system for that18:48
*** clarkb has joined #openstack-community18:49
clarkbreed: hi18:49
mrmartinhi clarkb18:49
*** fungi has joined #openstack-community18:49
reedclarkb, we were talking about the packaging of askbot-theme and askbot-devel18:49
reedi think you and mrmartin spoke already about askbot-staging18:50
clarkbre 171066, if we use a feature branch we can abandon that change. The process would instead be: make feature branch called something like feature/new-theme, continue to deploy theme from master so do not push any breaking changes there, instead push new theme updates that are problematic to feature/new-theme, when feature/new-theme is ready merge it to master and it will be automatically deployed18:50
clarkbthis way you do not need any infra changes to get the work done18:50
clarkband if you find bugs on the old theme you can still address them by making changes to master18:50
mrmartinok, but first we need to solve the askbot-staging instance18:51
fungithe concern which has been expressed on 171066 is mainly that it encourages having a master branch which is not actually usable, but also any time you want to change what version you've pinned to it'e yet another review against the system-config repo for the infrastructure core reviewers to need to review18:51
mrmartintagging the repos, and consuming tagged versions could solve that issue18:52
reedthe other problem I see is teaching Evgeny that he has to avoid using master18:52
fungiwhy would pushing new commits to a feature branch need askbot-staging to exist when 171066 doesn't?18:52
mrmartinwe are using that model for groups.o.o18:52
reedI think he has +2+w rights on that repo18:52
mrmartinfungi: because I think we need to test those changes somewhere, on a staging server18:53
fungimrmartin: and pushing them to master doesn't have that same need?18:53
mrmartinand if everything is perfect there, we can roll out a new release, that can be deployed to production18:53
reedI marton and Evgeny have core status on that project18:54
mrmartinso the model is this: dev -> master branch / production -> tagged version18:54
fungithe risk with deploying tags from master is that you'll ultimately need branches anyway, because you're likely to get yourself into a state where master is an unusable work-in-progress and you need to backport a fix of some sort to production, which either means reverting everything on master so you can push and tag your trivial fix, or having a branch for production (master?) and a different18:54
fungibranch for development (feature/something?)18:54
clarkbyes we ran into this with pbr pretty badly18:55
clarkband I would like to avoid it in the future with other projects as much as possible18:55
mrmartinok.18:55
clarkb(we broke master but then had to release to fix other bugs so ended up branching anyways)18:55
mrmartinif we are open a new branch for development, what is the proper way to send patches into that specific branch?18:56
clarkbmrmartin: `git review $branchname` you can also edit the .gitreview file on that branch to make it push to that branch by default18:56
mrmartinso, if I understand, than master branch is the production one, and feature/something dedicated for development18:57
fungiright. and clarkb or i can go create that feature branch right now, whatever name you want it to have18:57
mrmartinok, but with feature branches, if we like to maintain a staging server, we need to introduce a staging branch too?18:57
fungionly takes a second and you're off to the races18:57
fungimrmartin: you could, or you could just deploy the feature branch on your staging server18:58
clarkbmrmartin: no, I think we can just deploy the staging server off of the feature branch?18:58
mrmartinor we need to use a single branch dedicated for all development things18:58
mrmartinok, but how do you select which feature branch the staging server need consume?18:58
clarkbwhichever is most appropriate, like the branch for the new theme18:59
fungiahh, you're asking in the event you have more than one feature branch. i would probably just stick with one long-lived feature branch in this case and not bother getting rid of it. just merge to and from it as appropriate once it's tested the ways you want (e.g. on the staging server or whatever)18:59
mrmartinok, but I have a system-config for staging server, where I need to set which will be the proper git branch I like to deploy18:59
mrmartinfungi: exactly18:59
mrmartinit'll mean a system-config change too18:59
reedaskbot doesn't even have proper versioning18:59
mrmartinreed, yeah, but we are on it19:00
clarkbmrmartin: yes ut its a one time change unlike the current proposal which requires changes each time you wantto update the theme19:00
mrmartinclarkb: I don't get the difference19:00
mrmartinimagine that, askbot is working on multiple features19:00
clarkbmrmartin: the difference is the reviewers for system-config don't need to be in the pipeline for typical theme updates19:00
clarkbmrmartin: instead you would just merge to master and it would automatically get deployed19:00
fungimrmartin: what i'm suggesting, and what i think clarkb is suggesting, is not to do development in lots of feature branches. just keep one called feature/development or feature/next or something19:01
clarkb(or merge to the feature branch in the case of staging)19:01
mrmartinso for this branching model we have a master for production, and need feature/development19:01
clarkbyup19:01
reedi think I understand the difference: you always deploy from master, so you merge the feature branch in master and you're done19:01
mrmartinok. so we can agree, that we have a master branch for production19:01
reedno waiting for system-config change to review19:01
fungiright, and forward-port production fixes into the feature/development branch as needed19:01
fungiso that you don't end up with regressions in your featu5re branch19:02
mrmartinand we have a staging branch dedicated for staging sizes19:02
mrmartinsites19:02
reedthe issue then is education for core *not* to merge in master19:02
mrmartinso if somebody like to merge a feature branch, first he need to merge into staging one19:02
reeduntil the features are tested19:02
mrmartinand if everything seems to be perfect, then merge to master, right?19:02
clarkbmrmartin: or you can direct deploy staging from the feature ranch then when you are happy with staging merge feature into master19:03
mrmartinok.19:03
mrmartinit is a bit simpler19:03
fungiwell, i don't think you even need a staging branch separate from feature/development necessarily. if your proposed changes to feature/development in gerrit are well tested then they're unlikely to break staging, and if they do break staging, you just put up a fix for that19:03
clarkbfungi: yup19:03
mrmartinso a two branch model19:03
*** mwagner_lap has joined #openstack-community19:03
reedsince we'll be rolling updates to theme, I suggest the name of the feature to be feature/asktheme-dev or something19:03
mrmartinso you release from staging19:04
fungiright, release from staging by merging it to master19:04
fungionce you're satisfied it's working the way you want19:04
mrmartinwhat is the difference between master/HEAD and tagging for prod?19:05
clarkbmrmartin: if you tag for prod then each new tag has to be specifically added as a system-config change19:05
fungiyou could also tag that merge commit to add versioning in git that way if you wanted19:05
fungiand just not rely on that for deployment automation19:05
fungisimply as informational metadata19:06
reedsystem-config changes are painful so less of them is good19:06
clarkbthis is similar to how we deploy zuul and nodepool19:06
clarkbexcept we don't use a branch we just always roll forwrad in a working state (thats the goal at least)19:06
reedI think an educational article here, with pictures, would be good19:06
mrmartinok, my question here, the actual askbot.o.o relies on a pip askbot package and the askbot-theme git master branch19:07
mrmartinso we need to ask Evgeny to follow our new branching model19:07
reedyes19:07
mrmartinand create this staging branch for both askbot-devel and askbot-theme19:07
reedi'll remove his rights to askbot-theme-core19:08
*** Youcef has quit IRC19:08
mrmartinwhy do you like to remove his rights?19:08
reedjust in case19:08
reed:)19:08
mrmartinwe need to let him commit into the staging branch19:08
reedno, I'll call a meeting to educate him19:08
mrmartinok.19:08
mrmartinso the actions here:19:08
mrmartin1. create the staging branch for askbot-theme19:09
fungi_if_ you decide it's necessary, we can separately control who can approve changes to the feature branch vs master, and who can propose merge commits from the feature branch to master for more fine-grained access19:09
mrmartin2. create the staging branch for askbot-devel19:09
mrmartinmy concern here, that askbot-devel lives at Evgeny's separate github repository19:09
mrmartinand we don't have control on that19:09
clarkbmrmartin: I don't think askbot-devel needs to follow the same process19:09
clarkbthis is purely for the repo we do control19:10
fungithe bigger issue with askbot-devel is that i guess he's not doing releases consistently?19:10
mrmartinthe plan that we like to rolling upgrade the askbot-devel in the same way19:10
reedfor askbot-devel we pin to what we prefer in our puppet-askbot manifests, right?19:10
mrmartinhe is adding patches constantly19:10
mrmartinreed: no, it is a system-config setting19:10
reedfungi, right, that's the issue there19:11
fungidoes he release from askbot-devel in some way once it's tested/ready?19:11
reedfungi, I have the impression he can be taught how to do a proper release19:11
mrmartinhttps://github.com/openstack-infra/puppet-askbot/blob/master/manifests/init.pp#L1819:11
reedbut it'll take time and an investment in education on our side19:11
mrmartinok, it's a puppet-askbot, but if we follow the proper patterns, we need to move to ask.pp in system-config19:12
fungiwe could also consider having the askbot-theme source embed an askbot-devel git ref with which it should be deployed, and then have the deployment tooling key off that19:12
mrmartinso we need to change the whole deployment model for ask.o.o too19:12
clarkbI don't think we do19:13
clarkbaskbot is independent19:13
clarkbwe aer not the upstream, we can deal with the upstream's release model as appropriate19:13
clarkbbut for projects where we are the upstream we can make a release model that makes sense for ease of deployment19:13
mrmartinok, but if he need to change anything for a new feature or theme, that affects upstream19:13
mrmartinthan he need to do a full pip release19:13
mrmartinfor example, adding openstackid auth to askbot19:14
mrmartinwe need to propagate those changes into askbot-staging.o.o19:14
mrmartinand for that, we need to consume askbot-devel and theme from git, together19:15
clarkbya so I think for asbot-staging we can consume latest and greatest. If it breaks we work with upstream to fix it19:15
clarkbthen for ask.o.o we deploy specific versions that make everyone happy (assuming that is the upstream release model)19:15
mrmartinso it is much better to change the deployment model of ask.o.o to consume both askbot-theme and askbot-devel directly from git19:15
reedfrom master you mean?19:16
mrmartinyes19:16
mrmartinbut we need to ask Evgeny to follow our release model for whole ask-devel repo19:16
reedand that's the point of the feature branch, right?19:16
mrmartinyes19:16
reedok, we're getting there19:16
reed:)19:16
mrmartinand that way, we can avoid system-config changes, and version pining19:16
mrmartinwe need to write it down somewhere19:17
reedi'll give it a shot19:17
mrmartinwe've this openstackid etherpad somewhere19:17
reedi'm calling for a meeting with evgeny on Monday19:17
mrmartinnot askbot etherpad19:17
reedmeanwhile, please review and merge https://review.openstack.org/#/c/176624/19:17
reedit's urgent19:18
mrmartinmy only concern, that new puppet-askbot that support the consume of git, will break the compatibility of actual one19:18
mrmartinthe other thing, that Evgeny need properly handle the requirements.txt19:19
mrmartinand enlist all of required python lib dependencies19:19
mrmartinbecause a lot of thing is missing19:20
*** jtomasek has quit IRC19:20
mrmartinreed: I'm not a core on 176624, so I gave a +119:20
reedright, there are issues with his approach, we'll have to spend time to educate him19:20
reedwhy are you  not core there?19:21
mrmartinbecause it is tied to infra19:21
mrmartinI'm not an infra core19:21
reedah, right19:21
reedclarkb, fungi: can you please review and approve https://review.openstack.org/#/c/176624/? there is a critical bug (prevents one user from logging in the site)19:22
mrmartinhttps://etherpad.openstack.org/p/askbot-integration19:23
clarkbreed: mrmartin in that table only LP is allowed which is openid19:23
clarkbwhat is the distinction there?19:23
reedclarkb, there is a different module for launchpad19:23
clarkbsure but if only launchpad is allowed then how does adding openid help?19:24
reedlaunchpad is *only* launchpad, openid is generic enter your url19:24
mrmartinwe'll mess up user accounts :)19:24
reedok, wait a sec19:24
clarkbmaybe I need more background on what is broken19:24
reedcheck the bug19:24
reedcheck what Evgeny suggested to fix the issue19:25
reedif we still have the old machine up, check  how the config is there19:25
clarkbthe bug doesn't help me19:25
clarkbonly launchpad is allowed so how did they ever login with a non lp user before?19:25
fungiapparently this was a regression19:25
clarkbI guess thats my question19:26
reedclarkb, because in the old site openid was working19:26
clarkboh I thought we specifically made that one single sign on19:26
reedI could enable and disable via the settings19:26
funginope, it's multi-signin already19:26
clarkbgah19:26
mrmartinmaybe a missing dependency?19:26
reedon the UI19:26
clarkbI thought we weren't going to allow that anywhere bceause it leads to these problems19:26
mrmartinfungi: we need to diff installed pip packages19:26
reedfungi, i don't udnerstand. Did you check the old machine?19:26
mrmartinpip freeze on both new and old server19:26
clarkb(as a user I hate that I can never remember whichopenid I used so then end up having 10 accounts on a service)19:27
mrmartinmigrate everyone to openstackid o.o profile19:27
fungireed: no, surmising because the bug reporter claims they were previously able to log in with a freeform openid url19:27
reedclarkb, askbot was born with multiple sources of identities19:27
clarkbreed: when I was told to spin one up many months ago requirement 1 was LP openid login only19:28
fungiyeah, right now when i go to the login page my options are yahoo and launchpad19:28
clarkbI guess that changed19:28
reedi'm assuming that the configuration was copied over differently19:28
clarkbbut if this is a regression I will approve the puppet change19:28
fungigoogle was there at one point as well, but when google dropped openid support that was removed i think19:28
mrmartinAs I remember, I made the template from original config of the old server19:28
reedi disabled Google today because we failed to upgrade Askbot in time before GOogle disabled openid19:29
reedwe now have many users who cannot login anymore19:29
clarkbmrmartin: ya I am pretty sure it was LP only at one point but that may have changed? in any case fix is approved19:29
reedthanks clarkb, let's hope it fixes the issue19:29
mrmartinlet's try to approve the fix, if it won't work, then it can be a missing dependency issue19:29
fungii believe the reason it ended up not being lp-only was to encourage people to participate more freely without needing an lp account19:29
clarkbfungi: and now they don't have working accounts because google gonna google19:30
fungiindeed19:30
reedyeah19:30
fungipypi has been dealing with similar madness19:30
fungibecause they allowed google logins to pypi.python.org but only had openid support for that19:31
reedI was told I would have had openstackid for askbot a lot earlier than it actually shipped19:31
reedeventually, we'll have to migrate all of them to our and be over with google19:31
mrmartinwe still don't have openstackid support there, right?19:31
reedmrmartin, next thing in line19:31
clarkbwe should once openid is enabled right?19:31
clarkbjust type in the openid path19:31
mrmartinI still not see, what is the proper way of migrate users between different auth systems19:31
fungimrmartin: it varies a lot depending on the system19:32
mrmartin:)19:32
mrmartinsame email address?19:32
reedclarkb, when I tried with the old server that didnt'w rok19:32
fungithere is no one clean way19:32
mrmartinit's a trap19:32
reedok, I have to move on to another task19:33
clarkbthis is actually one of the nice features of mozillas persona thing iirc19:33
reedare we good with the feature branch?19:33
clarkbyou have all of the private side data for auth and you own it19:33
clarkbso you end up with a single identity that is usedeverywhere19:33
clarkbrather than multiple identities proxied by multiple services19:33
fungiwhat name did we pick for it? feature/development? i'll create it right now and get the acl update in19:33
reedfeature/development sounds good19:34
mrmartinfungi: can you override the .gitreview file too?19:34
fungimrmartin: sure. i'll propose that first thing19:34
mrmartinto tie the commits to feature/development branch?19:34
mrmartinand can we prevent somehow the commits into master?19:34
mrmartinor changing .gitreview is enough here?19:35
clarkbmrmartin: .gitreview should be enough for anyone using git review19:35
fungiwell, you prevent them by not approving then, but we can also change who's able to approve commits to master if you want19:35
mrmartinok.19:35
clarkbmrmartin: if you get any stray changes on master you can abandon or -2 them19:35
mrmartinyes19:35
fungiclarkb: what's the trick for avoiding merging the modified .gitreview file from the feature branch into master, out of curiosity?19:36
clarkbfungi: I think it shows up as a merge conflict?19:36
clarkbits a good question19:36
mrmartin;)19:37
notmyname`git checkout master -- .gitreview && git commit --amend` is what I do19:37
notmynamefor the merge commit19:37
funginotmyname: awesome--thanks!19:37
fungiwe should probably update our feature branch instructions in the infra manual with that tip19:37
mrmartinyeap19:38
mrmartinand update in our heads19:38
fungimrmartin: https://review.openstack.org/176954 is the .gitreview change19:39
fungii'll have the acl and gerritbot addition for this up momentarily19:39
notmynamea git alias for "amend = commit --amend" (so that you can do `git amend`) is also really handy. makes common errors like `git commit -amend` not happend (which will commit every modified file and give it the commit message "end")19:40
fungioh, yeah _that's_ a rather nasty typo19:40
*** annegent_ has quit IRC19:40
clarkbha19:40
mrmartinnotmyname: argh19:40
mrmartinsimilare to rm -rf/19:41
*** annegentle has joined #openstack-community19:41
mrmartinok, so we need to ask Evgeny to setup the same branching model, and follow the merging policy for releases19:41
fungimrmartin: https://review.openstack.org/176958 is the merge commit support patch. when that lands i'll add you to the new askbot-theme-release group for that19:45
mrmartinfungi: thnx.19:46
fungijust need to start being careful to not accidentally push merge commits for review (though if you do accidentally, they should be easy to spot--just don't approve them if they're an accident!)19:47
mrmartinyeah, need to learn that19:47
*** jtomasek has joined #openstack-community19:48
reedmrmartin, i'm writing to Evgeny telling him about the feature branch and calling a meeting on Monday (on our scheduled meeting, 10am PDT)19:53
mrmartinok, great, and I'm working on this askbot-puppet module that is based on git repos using this new branching model19:54
*** Harry51S has quit IRC19:54
reedBTW, OpenID now works20:00
reedbut when trying to use openstakcid, i still get "OpenID https://openstackid.org/stefano.maffulli is invalid"20:01
reedoh well... it should work now20:01
mrmartineh20:06
reedwe'll debug openstackid integration another time, that's what I mean20:10
*** cdent has joined #openstack-community20:18
*** mrmartin has quit IRC20:25
*** electrocucaracha has quit IRC20:43
*** electrocucaracha has joined #openstack-community20:58
*** sarob has quit IRC20:59
*** tiswanso_ has quit IRC20:59
*** annegentle has quit IRC21:15
*** annegentle has joined #openstack-community21:20
*** cdent has quit IRC21:22
*** annegentle has quit IRC21:44
*** jtomasek has quit IRC21:53
*** Guest47750 has joined #openstack-community22:03
*** openstackstatus has quit IRC22:09
*** electrocucaracha has quit IRC22:11
*** electrocucaracha has joined #openstack-community22:23
*** Guest47750 has quit IRC22:44
*** annegentle has joined #openstack-community23:03
*** annegentle has quit IRC23:14
*** mattgriffin has quit IRC23:28
*** julim has quit IRC23:28
*** Marga_ has joined #openstack-community23:38
*** electrocucaracha has quit IRC23:54

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