| *** annegentle has joined #openstack-community | 00:15 | |
| *** annegentle has quit IRC | 00:20 | |
| *** Marga_ has quit IRC | 00:23 | |
| *** Marga_ has joined #openstack-community | 00:45 | |
| *** Marga_ has quit IRC | 00:46 | |
| *** Marga_ has joined #openstack-community | 00:53 | |
| *** Marga_ has quit IRC | 00:54 | |
| *** tiswanso has joined #openstack-community | 01:10 | |
| *** tiswanso_ has joined #openstack-community | 01:12 | |
| *** tiswanso has quit IRC | 01:14 | |
| *** tiswanso_ has quit IRC | 01:17 | |
| *** tiswanso has joined #openstack-community | 01:17 | |
| *** Piet has joined #openstack-community | 01:41 | |
| *** mattgriffin has joined #openstack-community | 01:43 | |
| *** mattgrif_ has joined #openstack-community | 01:50 | |
| *** mattgriffin has quit IRC | 01:52 | |
| *** mwagner_lap has quit IRC | 02:07 | |
| *** mwagner_lap has joined #openstack-community | 02:21 | |
| *** tiswanso has quit IRC | 02:58 | |
| *** GonZo2K has quit IRC | 03:31 | |
| *** subscope_ has joined #openstack-community | 04:30 | |
| *** Marga_ has joined #openstack-community | 04:41 | |
| *** mrmartin has joined #openstack-community | 04:45 | |
| *** sarob has joined #openstack-community | 05:09 | |
| *** Marga_ has quit IRC | 05:10 | |
| *** Marga_ has joined #openstack-community | 05:11 | |
| *** mattgrif_ has quit IRC | 05:35 | |
| *** Marga_ has quit IRC | 05:36 | |
| *** Marga_ has joined #openstack-community | 05:36 | |
| *** Marga_ has quit IRC | 05:36 | |
| *** Marga_ has joined #openstack-community | 05:37 | |
| *** mattgriffin has joined #openstack-community | 05:39 | |
| *** Marga_ has quit IRC | 05:42 | |
| *** mattgriffin has quit IRC | 05:49 | |
| *** sarob has quit IRC | 05:54 | |
| *** sarob has joined #openstack-community | 05:59 | |
| *** subscope_ has quit IRC | 06:11 | |
| *** neeti has joined #openstack-community | 06:32 | |
| *** sarob has quit IRC | 06:53 | |
| *** jtomasek has joined #openstack-community | 06:54 | |
| *** sarob_ has joined #openstack-community | 06:54 | |
| *** sarob_ has quit IRC | 06:58 | |
| *** coolsvap|afk is now known as coolsvap | 07:08 | |
| *** coolsvap is now known as coolsvap|afk | 07:09 | |
| *** dizquierdo has joined #openstack-community | 07:27 | |
| *** neeti has quit IRC | 07:32 | |
| *** neeti has joined #openstack-community | 07:34 | |
| *** jcoufal has joined #openstack-community | 07:57 | |
| *** dizquierdo has quit IRC | 08:09 | |
| *** dizquierdo has joined #openstack-community | 09:40 | |
| *** Marga_ has joined #openstack-community | 09:48 | |
| *** Marga_ has quit IRC | 09:50 | |
| *** Marga_ has joined #openstack-community | 09:50 | |
| *** cdent has joined #openstack-community | 09:57 | |
| *** Marga_ has quit IRC | 10:06 | |
| *** mrmartin has quit IRC | 10:36 | |
| *** Harry51S has joined #openstack-community | 10:40 | |
| *** cdent has quit IRC | 11:20 | |
| *** wznoinsk has quit IRC | 11:22 | |
| *** Marga_ has joined #openstack-community | 11:41 | |
| *** Marga_ has quit IRC | 11:57 | |
| *** diegows has joined #openstack-community | 11:57 | |
| *** EmilienM has quit IRC | 12:01 | |
| *** EmilienM has joined #openstack-community | 12:01 | |
| *** rbowen has quit IRC | 12:04 | |
| *** dizquierdo has quit IRC | 12:11 | |
| *** diegows has quit IRC | 12:46 | |
| *** mattgriffin has joined #openstack-community | 12:49 | |
| *** mattgriffin has quit IRC | 12:50 | |
| *** mwagner_lap has quit IRC | 12:51 | |
| *** Piet has quit IRC | 12:52 | |
| *** mrmartin has joined #openstack-community | 12:57 | |
| *** rbowen has joined #openstack-community | 13:01 | |
| *** dizquierdo has joined #openstack-community | 13:08 | |
| *** diegows has joined #openstack-community | 13:32 | |
| *** tiswanso has joined #openstack-community | 13:43 | |
| *** dpose has joined #openstack-community | 13:53 | |
| *** mwagner_lap has joined #openstack-community | 13:54 | |
| dpose | hello dizquierdo :) | 13:54 |
|---|---|---|
| dizquierdo | hi dpose | 13:54 |
| dizquierdo | mrmartin, hello there :) | 13:54 |
| dizquierdo | do you have a minute? it's to check when you have some time | 13:54 |
| dizquierdo | to have a look at the puppet recipes | 13:54 |
| *** diegows has quit IRC | 13:54 | |
| dizquierdo | and get some feedback to improve them | 13:54 |
| dpose | hi, mrmartin | 13:54 |
| mrmartin | hi | 13:57 |
| dizquierdo | hi! | 13:57 |
| dizquierdo | and if there's not time till the next meeting, we may fix another moment | 13:57 |
| dizquierdo | :) | 13:57 |
| *** mattgriffin has joined #openstack-community | 13:58 | |
| mrmartin | which is the github repo? | 13:58 |
| mrmartin | we need to focus on specs first | 13:58 |
| *** neeti has quit IRC | 13:58 | |
| dizquierdo | sure | 13:58 |
| dizquierdo | mrmartin, https://github.com/MetricsGrimoire/puppet-metricsgrimoire | 13:59 |
| mrmartin | thnx. | 14:00 |
| mrmartin | guys, are you using puppet-lint to check the compliance of puppet scripts? | 14:03 |
| dizquierdo | mrmartin, don't think so | 14:04 |
| mrmartin | puppet-lint cvsanaly.pp | wc -l | 14:04 |
| mrmartin | 83 | 14:04 |
| dizquierdo | ok, crappy style | 14:05 |
| mrmartin | :) | 14:05 |
| dizquierdo | probably all of the file indeed | 14:05 |
| dizquierdo | u_u | 14:05 |
| mrmartin | I suggest to check the patterns at github.com/openstack-infra | 14:05 |
| dizquierdo | I didn't know about the existence of puppet-lint, thanks a lot | 14:05 |
| dizquierdo | mrmartin, any similar tool we should use before pinging you again? | 14:05 |
| mrmartin | yeah. basically the infra gating scripts using puppet-lint to check the code compliance | 14:07 |
| dizquierdo | ok | 14:07 |
| mrmartin | and I suggest to read the http://ci.openstack.org/project.html#contributing docs | 14:07 |
| dizquierdo | yep, that's a good point | 14:07 |
| mrmartin | and basically the whole ci.openstack.org documentation | 14:08 |
| mrmartin | and strongly check the existing puppet scripts | 14:08 |
| dpose | mrmartin, we are not using puppet-lint to check the compilance of puppet scripts, but we are running all of them to check they are working | 14:08 |
| mrmartin | I know a lot of pattern is not written in stone, just some best-practice, so it is a good chance to identify those | 14:08 |
| dizquierdo | ok, we'll come back with hopefully improved recipes | 14:08 |
| dizquierdo | sure sure | 14:08 |
| mrmartin | dpose: yeah, it is a good start | 14:09 |
| dizquierdo | at least those work :) | 14:09 |
| dizquierdo | ok, so there's a list of items to fix | 14:09 |
| dizquierdo | thanks for the pointers mrmartin | 14:09 |
| dizquierdo | we'll try to have them by this Monday | 14:09 |
| dizquierdo | so we can keep rolling | 14:09 |
| dpose | mrmartin, from now we are using puppet-lint too :) | 14:09 |
| mrmartin | we used to add an init.pp | 14:10 |
| mrmartin | https://github.com/puppetlabs/puppetlabs-apache | 14:11 |
| mrmartin | this puppet module is a good example how ot organize parameters, services, configuration etc. | 14:12 |
| dizquierdo | quite a big one :), ok, taking note | 14:13 |
| mrmartin | I'll review the specs during the weekend | 14:14 |
| dizquierdo | the specs is at https://etherpad.openstack.org/p/activity-infratization-spec | 14:14 |
| dizquierdo | afair | 14:14 |
| dpose | mrmartin, ok. We'll use that example to make our recipes similar to that one | 14:17 |
| mrmartin | great | 14:18 |
| mrmartin | I'll try to deploy that, and I'll come back with question, and we can clarify the specs | 14:18 |
| dizquierdo | ok, thanks mrmartin | 14:19 |
| dizquierdo | this is in any case the first step: to install the tools | 14:19 |
| dizquierdo | then we need to produce another recipe to run them | 14:19 |
| dpose | thanks mrmartin | 14:20 |
| *** mattgrif_ has joined #openstack-community | 14:28 | |
| *** mattgriffin has quit IRC | 14:29 | |
| *** mattgrif_ is now known as mattgriffin | 14:30 | |
| *** dpose has quit IRC | 14:41 | |
| *** electrocucaracha has joined #openstack-community | 14:48 | |
| *** Marga_ has joined #openstack-community | 14:50 | |
| *** julim has joined #openstack-community | 14:54 | |
| *** electrocucaracha has quit IRC | 15:00 | |
| *** electrocucaracha has joined #openstack-community | 15:01 | |
| *** electrocucaracha has quit IRC | 15:11 | |
| *** electrocucaracha has joined #openstack-community | 15:12 | |
| *** electrocucaracha has quit IRC | 15:19 | |
| *** electrocucaracha has joined #openstack-community | 15:28 | |
| *** electrocucaracha has quit IRC | 15:34 | |
| *** electrocucaracha has joined #openstack-community | 15:36 | |
| *** Piet has joined #openstack-community | 15:39 | |
| *** electrocucaracha has quit IRC | 15:43 | |
| *** cdent has joined #openstack-community | 15:45 | |
| *** Marga_ has quit IRC | 15:45 | |
| *** electrocucaracha has joined #openstack-community | 15:51 | |
| *** Marga_ has joined #openstack-community | 15:55 | |
| *** electrocucaracha has quit IRC | 15:58 | |
| *** electrocucaracha has joined #openstack-community | 16:00 | |
| notmyname | reed: from a while back, I see an OpenStack EU day schedule in Paris for "June TBD". do you have any more info on that? | 16:15 |
| reed | notmyname, nope, sorry | 16:15 |
| notmyname | as in it's not scheduled yet or you don't have info? | 16:16 |
| reed | notmyname, don't have any info :) | 16:16 |
| notmyname | ok :-) | 16:16 |
| notmyname | any idea who does? | 16:16 |
| reed | the events team is quite distant from me nowadays | 16:16 |
| notmyname | ah ok | 16:16 |
| notmyname | tom? | 16:16 |
| reed | the marketing mailing list | 16:16 |
| notmyname | marketing@ | 16:16 |
| notmyname | ? | 16:16 |
| reed | let me double-check | 16:16 |
| reed | OpenStack Marketing Mailing List <marketing@lists.openstack.org> | 16:17 |
| notmyname | ok, thanks. archives are private | 16:17 |
| reed | yes | 16:17 |
| notmyname | http://lists.openstack.org/cgi-bin/mailman/listinfo/marketing | 16:17 |
| reed | you can ask there though | 16:17 |
| reed | i haven't seen any message specifying the dates | 16:17 |
| reed | or you can email claire, as you prefer :) | 16:17 |
| notmyname | email sent | 16:18 |
| reed | cool | 16:18 |
| notmyname | thanks | 16:18 |
| notmyname | I'm trying to make a case for going to EU, so if I can go to this too, it helps my case :-) | 16:19 |
| reed | there are also dates being discussed for Budapest, berlin, Tel Aviv, Milan and Istambul | 16:20 |
| reed | a classic EME(-a) | 16:20 |
| notmyname | June 8, 2015 Budapest, Hungary | 16:21 |
| notmyname | June 2015 TBC Paris, France | 16:21 |
| notmyname | June 11, 2015 Berlin, Germany | 16:21 |
| notmyname | June 15, 2015 Tel Aviv, Israel | 16:21 |
| notmyname | that's what I have | 16:21 |
| notmyname | don't know about milan or istanbul | 16:22 |
| *** electroc_ has joined #openstack-community | 16:22 | |
| *** electrocucaracha has quit IRC | 16:24 | |
| *** dizquierdo has quit IRC | 16:28 | |
| *** jcoufal has quit IRC | 16:31 | |
| *** jcoufal has joined #openstack-community | 16:33 | |
| *** jcoufal has quit IRC | 16:36 | |
| reed | Milan hasn't published their schedule yet, it's June 9 | 16:36 |
| reed | Istambul is before, 6th or so IIRC | 16:36 |
| reed | I don't know much though, I only go where I'm told to go :) | 16:36 |
| notmyname | :-) | 16:37 |
| *** sarob has joined #openstack-community | 16:58 | |
| *** electrocucaracha has joined #openstack-community | 17:08 | |
| *** electroc_ has quit IRC | 17:10 | |
| *** GonZo2K has joined #openstack-community | 17:18 | |
| *** GonZo2K has quit IRC | 17:18 | |
| *** GonZo2K has joined #openstack-community | 17:18 | |
| reed | notmyname, you wrote to marketing@openstack not marketing@lists.openstack :) | 17:18 |
| notmyname | oh | 17:19 |
| reed | similar effect though: Claire will eventually reply :) | 17:19 |
| notmyname | oops | 17:19 |
| notmyname | :-) | 17:19 |
| notmyname | should I resend, though? | 17:19 |
| *** cdent has quit IRC | 17:30 | |
| *** mattgrif_ has joined #openstack-community | 17:52 | |
| *** mattgriffin has quit IRC | 17:52 | |
| *** mattgrif_ is now known as mattgriffin | 17:56 | |
| *** Marga_ has quit IRC | 17:56 | |
| mrmartin | reed | 17:58 |
| mrmartin | hi | 17:58 |
| reed | hi there | 17:58 |
| mrmartin | this askbot development model have some built-in risk :) | 17:58 |
| reed | right? :) | 17:58 |
| mrmartin | yes | 17:59 |
| * reed looks for the "surprised" paint | 17:59 | |
| mrmartin | :D | 17:59 |
| reed | can you be more specific? | 17:59 |
| reed | let's document the risks properly | 17:59 |
| mrmartin | so if we are consuming from github repo, and imagine the case, that we are releasing both theme and askbot | 18:00 |
| mrmartin | and the puppet actually runs, and picks up only the one github repo change | 18:00 |
| mrmartin | the theme and the askbot module can be out of sync | 18:00 |
| mrmartin | because it is not atomic, as an debian package repo where you can define dependencies by versions | 18:01 |
| mrmartin | so the release process must be very carefully planned and align to timing of puppet runs on the server | 18:01 |
| mrmartin | so I'm not saying here, that it is not working, just need to be very careful during the release | 18:02 |
| mrmartin | if you remember, we experienced the same issues with storyboard, when the angularjs and python api were out of sync | 18:02 |
| mrmartin | the other major thing, that we don't have a control over askbot release, and Evgeny don't have a gating mechanism to prevent commits to master branch, because he is not using a gating system | 18:04 |
| mrmartin | and I mean sudden / unwanted commit can break our whole production ask.o.o | 18:04 |
| reed | uhm | 18:05 |
| reed | so we have two issues here, IIUC: | 18:06 |
| mrmartin | it is not the case with theme, because it requires an approval on gating, so if two of us approves a patch into master instead of feature/development, than shame on us | 18:06 |
| reed | - one is to upgrade this thing *once* in order to fix the google auth problem | 18:06 |
| reed | - two is to have a *reliable* mechanism to upgrade it regularly | 18:07 |
| mrmartin | what's wrong with the google auth anyway? Evgeny need to patch the askbot-devel only? | 18:07 |
| reed | I think we have to focus on 1 first, make a quick upgrade on Monday | 18:07 |
| reed | the google auth we have now (disabled) is using openid from google | 18:07 |
| reed | google deprecated it and shut it down | 18:08 |
| reed | askbot supports oauth google but only as an *alternative* | 18:08 |
| reed | with the current version | 18:08 |
| reed | once we upgrade Evgeny says there is a fix | 18:08 |
| reed | (not sure even what that fix looks like, hopefully it's as simple as splitting the two google auth providers) | 18:09 |
| reed | so both can be enabled | 18:09 |
| reed | or something | 18:09 |
| mrmartin | oh ok. | 18:09 |
| reed | anyway, we need to upgrade quickly | 18:09 |
| reed | so we need ask-staging | 18:09 |
| mrmartin | quick upgrades can happen through pip, we just need to push to askbot version in system-config | 18:09 |
| mrmartin | (what infra don't like to see :) | 18:09 |
| reed | great | 18:10 |
| reed | we'll get through them with patience :) | 18:10 |
| reed | how hard is it for us to make pip packages? | 18:10 |
| mrmartin | or we can ask somebody from infra to apply to patch manually | 18:10 |
| clarkb | updating askbot that way is fine | 18:10 |
| clarkb | because that is askbots release model. | 18:10 |
| mrmartin | great | 18:10 |
| clarkb | for the theme however we have complete control and can do it better there | 18:11 |
| reed | mrmartin, so back to the two issues | 18:11 |
| reed | I'd like to have a roadmap and quick deadline for an upgrade on monday | 18:12 |
| mrmartin | ok. | 18:12 |
| mrmartin | so it's a control question, we don't have the same control on askbot-devel then we have on askbot-theme | 18:12 |
| reed | if it's a new pip package and a theme in a feature branch or something else I don't care much on the implementation, I would like to see the result :) | 18:12 |
| reed | do we need the staging server for the quick upgrade path? | 18:13 |
| mrmartin | ok, let's see the patch first, what Evgeny delivers | 18:13 |
| mrmartin | if the patch is well tested we don't need to staging server | 18:13 |
| reed | the theme patch you mean? | 18:13 |
| reed | or the askbot-devel patch? | 18:13 |
| mrmartin | yeah, so the question, whether this patch the theme, the askbot-devel or both of them? | 18:13 |
| reed | both | 18:14 |
| reed | askbot-devel patch I think is the current master and you can check it out now | 18:14 |
| reed | the theme is probably a small one to adapt theme to current master | 18:14 |
| reed | but i'm speculating, I don't know how different are the themes between our askbot version and -devel | 18:15 |
| mrmartin | ok, if the askbot patch works with the current theme, then don't need to worry | 18:15 |
| mrmartin | first upgrade the askbot to new pip version, then upgrade the theme later | 18:16 |
| mrmartin | and we can rollback to previous pip if things starting to break - if not contains any db schema changes that we cannot rollback | 18:16 |
| reed | i think the current theme is not compatible 100% with the askbot-devel/master (or whatever newer version we need to install to solve the google issue) | 18:17 |
| reed | i think we need the staging server or some sort of testing mechanism | 18:18 |
| mrmartin | yeah, but what is the meaning on non-compatibility ? is it brake everything, and the site pages cannot render | 18:18 |
| mrmartin | or just simply doesn't look good | 18:18 |
| reed | I have no idea | 18:18 |
| reed | good point though | 18:18 |
| mrmartin | because if it is a non-breaking change, and maybe have a some css or design thing, than we don't have a problem here | 18:18 |
| mrmartin | ok, we need to ask Evgeny about this on Monday | 18:19 |
| reed | we don't have a problem becase we can upgrade the theme after the code upgrade? | 18:19 |
| mrmartin | yes, if the code-upgrade not breaking the theme. so new askbot-devel works with old-theme | 18:20 |
| mrmartin | then we have time to upgrade the theme later. if it is breaking than we can decrease this maintenance window with some infra help | 18:20 |
| mrmartin | and somebody need to do a manual git pull on theme repo and rebuild static files, when the new askbot-devel have been rolled out | 18:21 |
| mrmartin | easy :) | 18:21 |
| reed | Evgeny already has the patch for the new theme, so he says | 18:21 |
| mrmartin | ok, then he can post it into askbot-theme's feature/development branch | 18:21 |
| reed | indeed, he can | 18:22 |
| reed | and should | 18:22 |
| reed | btw, i need to send him instructions for that | 18:22 |
| reed | let me do that now | 18:22 |
| reed | did the .gitreview merge? | 18:22 |
| mrmartin | I just checked, not yet | 18:22 |
| mrmartin | https://github.com/openstack-infra/askbot-theme/blob/master/.gitreview | 18:23 |
| mrmartin | https://github.com/openstack-infra/askbot-theme/blob/feature/development/.gitreview | 18:23 |
| mrmartin | sorry | 18:23 |
| mrmartin | I was looking the wrong branch :D | 18:23 |
| mrmartin | so it is in feature/development | 18:23 |
| mrmartin | he need to check out that branch | 18:23 |
| reed | * [new branch] feature/development -> origin/feature/development | 18:23 |
| reed | nice | 18:23 |
| mrmartin | anyway, the puppet for askbot-stating that can consume the git repos for theme and askbot-devel is almost ready | 18:24 |
| mrmartin | so on monday, we can do a test locally, even if we don't have a live askbot-staging server | 18:24 |
| mrmartin | it works from Vagrant | 18:24 |
| mrmartin | or I can deploy it for you into a public cloud somewhere, and give access for testing | 18:25 |
| reed | cool | 18:25 |
| reed | I think we're good to go for monday | 18:25 |
| mrmartin | yeah, great I thing it is the best we have now, but it is enough | 18:26 |
| *** Marga_ has joined #openstack-community | 18:26 | |
| mrmartin | then, we can merge the puppet-askbot changes and launch the staging askbot, and further modifications can be tested there | 18:26 |
| reed | right, we have to make do | 18:27 |
| reed | use what we have :) | 18:27 |
| mrmartin | yeah, you know we always did that here in Central Europe :D | 18:27 |
| reed | indeed, it's true everywhere | 18:28 |
| mrmartin | MacGyver way :) http://en.wikipedia.org/wiki/MacGyver | 18:28 |
| reed | one clarification about the feature branch workflow | 18:29 |
| reed | is the usual `git remote update && git checkout master && git pull --ff-only origin master` still valid? | 18:29 |
| mrmartin | I made a notice yesterday into the etherpad | 18:30 |
| mrmartin | there was some magic with .gitreview file | 18:30 |
| reed | or you need to `checkout feature-branch` and pull pull --ff-only origin feature-branch ? | 18:30 |
| mrmartin | https://etherpad.openstack.org/p/askbot-integration | 18:30 |
| mrmartin | `git checkout master -- .gitreview && git commit --amend` | 18:31 |
| mrmartin | i think it is just a single merge of feature/development into master | 18:31 |
| mrmartin | but we can get some help on Monday from infra | 18:33 |
| reed | i would like to tell evgeny now how to upload the patch for the theme | 18:34 |
| mrmartin | for the theme it is easy | 18:35 |
| mrmartin | simply checkout the feature/development branch | 18:35 |
| mrmartin | apply his theme patch | 18:35 |
| mrmartin | then do the standard git commit / git review | 18:35 |
| mrmartin | the only thing he needs to care to work in the proper branch | 18:35 |
| reed | right, that's what I want to make sure he does | 18:36 |
| reed | I can't find documentation for that | 18:36 |
| reed | http://docs.openstack.org/infra/manual/drivers.html#feature-branches is missing the instructions for the basic workflow | 18:36 |
| mrmartin | git clone -b feature/development git@github.com:openstack-infra/askbot-theme.git | 18:38 |
| mrmartin | git status | 18:38 |
| mrmartin | # On branch feature/development | 18:38 |
| mrmartin | nothing to commit, working directory clean | 18:38 |
| reed | why a new clone? | 18:38 |
| mrmartin | it is a standard git workflow with branches | 18:38 |
| mrmartin | I'm always used to clone out a clean repo :) | 18:39 |
| mrmartin | then I don't need to worry of leftover files | 18:39 |
| reed | clarkb, help :) | 18:39 |
| mrmartin | but if he pulls out the repo | 18:39 |
| clarkb | sorry following a different discussion, let me catch up | 18:40 |
| reed | clarkb, the basic workflow for using dev branches | 18:40 |
| mrmartin | simply change to the new branch | 18:40 |
| reed | is `git remote update && git checkout master && git pull --ff-only origin master` still valid? | 18:40 |
| reed | doesn't seem to be | 18:40 |
| clarkb | reed: no, you would replace master with your branch | 18:40 |
| clarkb | so master is really a branch placeholder there | 18:41 |
| reed | clarkb, i want to give evgeny the easy to follow instructions for him to send a patch for review | 18:41 |
| mrmartin | yeah, he need to change to the dev branch | 18:41 |
| mrmartin | git pull | 18:41 |
| clarkb | reed: just replace master with feature/development | 18:41 |
| clarkb | (I think that is what we named the new branch) | 18:41 |
| reed | clarkb, why don't I see that in my `git branch` list? | 18:41 |
| reed | (after a git remote upate) | 18:42 |
| clarkb | reed: it should should up in a git branch -a as remotes/origin/feature/development | 18:42 |
| clarkb | reed: then you can make the branch locally | 18:42 |
| clarkb | by default git won't make lcoal branches for everything after a clone | 18:42 |
| reed | good to know, so that's one step to add | 18:43 |
| clarkb | you can make the local branch with `git checkout -b feature/development origin/feature/development` | 18:43 |
| clarkb | then that will track the branch from origin and the steps you first pasted will work after replacing master | 18:44 |
| reed | thanks, trying that out now | 18:44 |
| * reed thinks we may add a branch to sandbox | 18:44 | |
| mrmartin | works here | 18:45 |
| clarkb | we can definitely do that | 18:45 |
| clarkb | (definitely add a branch to sandbox) | 18:45 |
| reed | yeah, let's do it | 18:45 |
| mrmartin | git lg | 18:45 |
| mrmartin | e5970c4 - (HEAD, origin/feature/development, feature/development) Add a .gitreview defaultbranch for development (23 hours ago) <Jeremy Stanl | 18:45 |
| mrmartin | f9f4bfa - (origin/master, origin/HEAD, master) Workflow documentation is now in infra-manual (5 months ago) <Jeremy Stanley> | 18:45 |
| mrmartin | 5e31bad - Add bundler support (5 months ago) <Marton Kiss> | 18:45 |
| mrmartin | 23f412f - Merge "updated the moderation queue url" (7 months ago) <Jenkins> | 18:45 |
| fungi | woot! | 18:45 |
| reed | On branch feature/development | 18:45 |
| reed | Your branch is up-to-date with 'origin/feature/development'. | 18:45 |
| reed | neat-o | 18:46 |
| reed | thanks folks | 18:46 |
| *** jtomasek has quit IRC | 18:46 | |
| fungi | also i added a review for notmyname's suggestion on omitting .gitreview from your merge commits between branches https://review.openstack.org/177034 | 18:46 |
| *** Piet has quit IRC | 18:53 | |
| reed | ok, thanks everybody | 18:54 |
| clarkb | I added a feature branch to sandbox, it already had a stable branch | 18:55 |
| *** Piet has joined #openstack-community | 19:13 | |
| *** electrocucaracha has quit IRC | 19:25 | |
| *** electrocucaracha has joined #openstack-community | 19:38 | |
| *** mrmartin has quit IRC | 20:21 | |
| *** rbowen has quit IRC | 20:24 | |
| *** rbowen has joined #openstack-community | 20:28 | |
| *** tiswanso has quit IRC | 20:29 | |
| *** mattgriffin has quit IRC | 20:30 | |
| *** Marga_ has quit IRC | 21:23 | |
| *** mwagner_lap has quit IRC | 22:03 | |
| *** electrocucaracha has quit IRC | 22:09 | |
| *** Marga_ has joined #openstack-community | 22:13 | |
| *** sarob has quit IRC | 23:02 | |
| *** electrocucaracha has joined #openstack-community | 23:08 | |
Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!