| *** dviroel|afk is now known as dviroel | 00:25 | |
| *** dviroel is now known as dviroel|out | 01:08 | |
| opendevreview | yuehui gan proposed openstack/manila master: Add Macrosan Manila Driver https://review.opendev.org/c/openstack/manila/+/825429 | 07:24 |
|---|---|---|
| opendevreview | yuehui gan proposed openstack/manila master: Add Macrosan Manila Driver https://review.opendev.org/c/openstack/manila/+/825429 | 07:53 |
| fzzf[m] | carloss: Hi, I upload a new patchset. but it show merge conflict. I found https://review.opendev.org/c/openstack/manila/+/825429/16/doc/source/admin/share_back_ends_feature_support_mapping.rst#253 and https://opendev.org/openstack/manila/src/branch/master/doc/source/admin/share_back_ends_feature_support_mapping.rst#mapping-of-share-drivers-and-common-capabilities , These two options have different parameters. Is this the reason? | 07:59 |
| fzzf[m] | carloss: gouthamr review.opendev.org doesn't have multiple subnets per AZ column, while opendev.org has multiple subnets per AZ column | 08:02 |
| fzzf[m] | * carloss: gouthamr review.opendev.org doesn't have "multiple subnets per AZ" column, while opendev.org has "multiple subnets per AZ" column | 08:40 |
| opendevreview | yuehui gan proposed openstack/manila master: Add Macrosan Manila Driver https://review.opendev.org/c/openstack/manila/+/825429 | 09:40 |
| opendevreview | yuehui gan proposed openstack/manila master: Add Macrosan Manila Driver https://review.opendev.org/c/openstack/manila/+/825429 | 09:56 |
| opendevreview | yuehui gan proposed openstack/manila master: Add Macrosan Manila Driver https://review.opendev.org/c/openstack/manila/+/825429 | 09:57 |
| fzzf[m] | gouthamr: carloss Hi, when I add doc/source/admin/share_back_ends_feature_support_mapping.rst file to modify in review.opendev.org, it didn't have "multiple subnets per AZ" item itself, this cause merge conflict. it's strange, but https://opendev.org/openstack/manila/src/branch/master/doc/source/admin/share_back_ends_feature_support_mapping.rst have "multiple subnets per AZ" item | 10:47 |
| *** dviroel|out is now known as dviroel | 11:26 | |
| vkmc | fzzf[m], which patch for review on review.opendev.org are you referring too? | 11:27 |
| vkmc | referring to* | 11:27 |
| *** dviroel is now known as dviroel|rover | 11:27 | |
| vkmc | I see that doc is broken though, hm | 11:27 |
| vkmc | is not rendering properly | 11:27 |
| opendevreview | Victoria Martinez de la Cruz proposed openstack/manila-tempest-plugin master: [CI] Add CephFS Native and CephFS NFS with cephadm jobs https://review.opendev.org/c/openstack/manila-tempest-plugin/+/834220 | 11:40 |
| opendevreview | Merged openstack/python-manilaclient master: [OSC] Implement Share Server Migration Cancel and Complete Command https://review.opendev.org/c/openstack/python-manilaclient/+/853166 | 11:53 |
| *** tosky is now known as Guest532 | 12:51 | |
| *** tosky_ is now known as tosky | 12:51 | |
| fzzf[m] | vkmc: hi, https://review.opendev.org/c/openstack/manila/+/825429 this patch, when I add doc/source/admin/share_back_ends_feature_support_mapping.rst | 14:45 |
| fzzf[m] | , this file wouldn't have "multiple subnets per AZ" item, while https://opendev.org/openstack/manila/src/branch/master/doc/source/admin/share_back_ends_feature_support_mapping.rst have this. | 14:45 |
| fzzf[m] | vkmc: I added "multiple subnets per AZ" item manually, it still shows megre conflict | 14:47 |
| *** dviroel|rover is now known as dviroel|rover|lunch | 15:02 | |
| gouthamr | fzzf[m]: thanks for doing that; it could come as a separate/different patch because some other drivers (NetApp, Container) support that configuration item | 15:12 |
| gouthamr | oh ignore me - it was already added with https://opendev.org/openstack/manila/commit/2dc60a0b4ea94dd3933ea04a8032be993a397b05 | 15:14 |
| gouthamr | fzzf[m]: are you sure you're rebasing with the "master" branch? | 15:14 |
| vkmc | trying to triage this... it's missing the release milestone https://bugs.launchpad.net/python-manilaclient/+bug/1973759 | 15:25 |
| vkmc | is it client-release? | 15:26 |
| vkmc | or do we need to wait for zed-3? | 15:26 |
| opendevreview | Victoria Martinez de la Cruz proposed openstack/python-manilaclient master: Add 'share-network' option for share replica create. https://review.opendev.org/c/openstack/python-manilaclient/+/804579 | 15:27 |
| fzzf[m] | gouthamr: I want to commit new driver. but have merge conflict with this item. There will be no conflicts unless I don't add share_back_ends_feature_support_mapping.rst | 15:32 |
| vkmc | fzzf[m], in order to do the rebase and fix the merge conflict you need to make sure you have the master branch in your local repo up to date (git checkout master and git pull origin master) | 15:33 |
| vkmc | fzzf[m], and then move back to the branch you are working | 15:34 |
| vkmc | fzzf[m], do a git rebase -i master | 15:34 |
| vkmc | fix any merge issue you might see | 15:35 |
| vkmc | and resubmit for review | 15:35 |
| vkmc | that should do | 15:35 |
| gouthamr | vkmc ++ | 15:35 |
| fzzf[m] | vkmc: I'm base with master in fact. I added the file on the web page, I didn't update local repo for a time | 15:38 |
| gouthamr | vkmc: https://bugs.launchpad.net/bugs/1973759 would be “zed-client-release” | 15:38 |
| vkmc | gouthamr, thx | 15:38 |
| fzzf[m] | * on the review.opendev.org web page, * web page directly, I | 15:38 |
| fzzf[m] | vkmc: okay, I'll try to update local repo. | 15:40 |
| vkmc | fzzf[m], let us know if you need further pointers | 15:41 |
| fzzf[m] | vkmc: I get, thanks :) | 15:42 |
| *** dviroel|rover|lunch is now known as dviroel|rover | 16:09 | |
| opendevreview | Merged openstack/python-manilaclient master: requirements: Add stestr https://review.opendev.org/c/openstack/python-manilaclient/+/834654 | 16:15 |
| opendevreview | Merged openstack/python-manilaclient master: requirements: Bump python-openstackclient version https://review.opendev.org/c/openstack/python-manilaclient/+/834655 | 16:15 |
| opendevreview | Victoria Martinez de la Cruz proposed openstack/manila master: Refactor the Ceph NFS driver to use Cephadm NFS https://review.opendev.org/c/openstack/manila/+/848987 | 17:29 |
| opendevreview | Victoria Martinez de la Cruz proposed openstack/manila master: Refactor the Ceph NFS driver to use Cephadm NFS https://review.opendev.org/c/openstack/manila/+/848987 | 17:31 |
| opendevreview | Merged openstack/puppet-manila stable/yoga: Ubuntu: Use utf8mb3_general_ci collate in MySQL https://review.opendev.org/c/openstack/puppet-manila/+/853684 | 18:16 |
| opendevreview | Alexander Deiter proposed openstack/manila master: [Infinidat] add support for TLS/SSL communication https://review.opendev.org/c/openstack/manila/+/853780 | 18:41 |
| opendevreview | Franca Mgbogu proposed openstack/python-manilaclient master: [OSC] Implement Share Server Migration Show Command https://review.opendev.org/c/openstack/python-manilaclient/+/852116 | 18:57 |
| opendevreview | Goutham Pacha Ravi proposed openstack/manila-tempest-plugin master: Use OVS with IPv6 data path testing jobs https://review.opendev.org/c/openstack/manila-tempest-plugin/+/853367 | 19:33 |
| opendevreview | Goutham Pacha Ravi proposed openstack/manila stable/wallaby: Rollback quota when share network create API fails. https://review.opendev.org/c/openstack/manila/+/853759 | 19:38 |
| opendevreview | Goutham Pacha Ravi proposed openstack/python-manilaclient stable/xena: Add FIPS testing jobs https://review.opendev.org/c/openstack/python-manilaclient/+/848115 | 20:16 |
| opendevreview | Goutham Pacha Ravi proposed openstack/python-manilaclient stable/xena: Add FIPS testing jobs https://review.opendev.org/c/openstack/python-manilaclient/+/848115 | 20:17 |
| opendevreview | Merged openstack/manila stable/xena: Rollback quota when share network create API fails. https://review.opendev.org/c/openstack/manila/+/845841 | 20:18 |
| *** dviroel|rover is now known as dviroel|rover|biab | 21:14 | |
| opendevreview | Merged openstack/python-manilaclient master: [OSC] Implement Share Server Migration Show Command https://review.opendev.org/c/openstack/python-manilaclient/+/852116 | 21:26 |
| *** dviroel|rover|biab is now known as dviroel|rover | 22:28 | |
| *** dviroel|rover is now known as dviroel|out | 22:50 | |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!