smoser | blackboxsw: ok. one or 2 questions | 02:48 |
---|---|---|
smoser | then i do go. | 02:48 |
smoser | 18.3-24-gf6249277-0ubuntu2 | 02:48 |
smoser | did you actually upload a 0ubuntu1 ? | 02:48 |
blackboxsw | smoser: I didn't so I was debating about just consolidating into ubuntu1 | 02:48 |
smoser | if not... you could have just adjusted | 02:48 |
smoser | yeah | 02:49 |
smoser | git rebase is really qonderful for that sort of thing | 02:49 |
blackboxsw | yeah ok I'll do that and the merge into origin/ubuntu/devel | 02:49 |
smoser | and in order to facilitate easier git rebase | 02:49 |
blackboxsw | yeah rebase -i | 02:49 |
blackboxsw | will do and collapse it | 02:49 |
smoser | and also easier 'git cherry-pick' | 02:49 |
smoser | if you put the 'update changelog' in a separate commit | 02:49 |
smoser | then its easier | 02:49 |
smoser | so commit one of debian/cloud-init.templates | 02:49 |
smoser | and then commit -m 'update changelog' | 02:49 |
smoser | because otherwise cherry-pick or rebase with those commits is always oing to conflict on a debian/changelog | 02:50 |
smoser | which isn't helpful | 02:50 |
blackboxsw | ok I get it, so don't collapse"fixup" the separate changelog commit | 02:50 |
smoser | no worries. its all fine. | 02:50 |
smoser | did you upload ? | 02:50 |
blackboxsw | nope just saw my curtin ubuntu/devel merged | 02:51 |
blackboxsw | you didn't do that right? | 02:51 |
smoser | yeah, just have 2 commits. you can look at the log in ubuntu/devel, its filled with "update changelog" messages for each change in debian/ | 02:51 |
smoser | i did not intend to merge anything.. | 02:51 |
blackboxsw | I was waiting on autolander for the curtin branch. | 02:52 |
smoser | hm.. | 02:52 |
blackboxsw | and hoped that jenkins would do it. | 02:52 |
smoser | i was always just merging the debian branches myself. | 02:52 |
smoser | building loacally and pusing. | 02:52 |
smoser | but its fine if we want the lander to do it. | 02:53 |
smoser | anyway.. i really should go | 02:53 |
smoser | enjoy the rest of your friday night ;) | 02:53 |
blackboxsw | and it is merged now so I'll upload curtin per build-and-push https://code.launchpad.net/~chad.smith/curtin/+git/curtin/+merge/353361 | 02:53 |
blackboxsw | http://paste.ubuntu.com/p/Vq8Mn2pTpt/ | 02:53 |
blackboxsw | thanks will do see ya | 02:53 |
blackboxsw | yeah waiting on autolander is taking too long, will sort what I can and get it tonight or tomorrow | 02:54 |
blackboxsw | night | 02:54 |
blackboxsw | lander failures 2018-08-18 03:00:18,589 - tests.cloud_tests - ERROR - stage: collect test data for xenial encountered error: [Errno 28] No space left on device: '/tmp/LXDInstance-cloud-test-ubuntu-xenial-modules-ntp-servers-2s2jjcujy8pnqtgks3gb_h9t5s' | 03:02 |
blackboxsw | gonna have to clean up torkoal again | 03:02 |
blackboxsw | ok gotta upload in prog head off https://launchpad.net/ubuntu/+source/cloud-init/18.3-24-gf6249277-0ubuntu1/+build/15278099 | 04:26 |
=== nicolas17_ is now known as nicolas17 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!