Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(nacos): distinguish services that has same name but in different groups or namespaces #5083

Merged
merged 16 commits into from
Sep 23, 2021
Merged

fix(nacos): distinguish services that has same name but in different groups or namespaces #5083

merged 16 commits into from
Sep 23, 2021

Commits on Sep 17, 2021

  1. fix apache#5061

    @tzssangglass
    tzssangglass committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    048733f View commit details
    Browse the repository at this point in the history

  2. fix CI error

    @tzssangglass
    tzssangglass committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    3c7df03 View commit details
    Browse the repository at this point in the history

  3. fix Ci error

    @tzssangglass
    tzssangglass committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    f48f1c3 View commit details
    Browse the repository at this point in the history

  4. fix Ci error

    @tzssangglass
    tzssangglass committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    05d97dc View commit details
    Browse the repository at this point in the history

  5. resolve code review

    @tzssangglass
    tzssangglass committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    44eb541 View commit details
    Browse the repository at this point in the history

  6. fix code lint

    @tzssangglass
    tzssangglass committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    1e7be32 View commit details
    Browse the repository at this point in the history

  7. add env for nacos docker shell

    @tzssangglass
    tzssangglass committed Sep 17, 2021
    Configuration menu
    Copy the full SHA
    7d8c2a9 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2021

  1. fix CI error

    @tzssangglass
    tzssangglass committed Sep 18, 2021
    Configuration menu
    Copy the full SHA
    195cec5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/apache/apisix into IssueN… 

    …o5061

� Conflicts:
�	ci/install-ext-services-via-docker.sh
    @tzssangglass
    tzssangglass committed Sep 18, 2021
    Configuration menu
    Copy the full SHA
    632de07 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2021

  1. fix CI error

    @tzssangglass
    tzssangglass committed Sep 19, 2021
    Configuration menu
    Copy the full SHA
    18df15f View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2021

  1. style: add indents 

    Signed-off-by: tzssangglass <tzssangglass@gmail.com>
    @tzssangglass
    tzssangglass committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    b24337f View commit details
    Browse the repository at this point in the history

  2. style: add indents 

    Signed-off-by: tzssangglass <tzssangglass@gmail.com>
    @tzssangglass
    tzssangglass committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    bba184c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/IssueNo5061' into IssueNo5061

    @tzssangglass
    tzssangglass committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    758dd5c View commit details
    Browse the repository at this point in the history

  4. chore(nacos): fix the logic of getting the default group_name and nam… 

    …espace_id

Signed-off-by: tzssangglass <tzssangglass@gmail.com>
    @tzssangglass
    tzssangglass committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    66e3055 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/apache/apisix into IssueN… 

    …o5061

� Conflicts:
�	apisix/discovery/nacos.lua
    @tzssangglass
    tzssangglass committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    5efe459 View commit details
    Browse the repository at this point in the history

  6. chore(debug): fetch master branch 

    Signed-off-by: tzssangglass <tzssangglass@gmail.com>
    @tzssangglass
    tzssangglass committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    5a2a1f9 View commit details
    Browse the repository at this point in the history