Skip to content

Commit c190d3c

Browse files
authored
Merge branch 'develop' into feat/gorm_lock
2 parents 34d4f15 + f00b891 commit c190d3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2362
-366
lines changed

api/mesh/v1alpha1/dynamic_config_helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
func GetOverridePath(key string) string {
2727
key = strings.Replace(key, "/", "*", -1)
28-
return key + constants.ConfiguratorRuleSuffix
28+
return key + constants.ConfiguratorRuleDotSuffix
2929
}
3030

3131
func (d *DynamicConfig) ListUnGenConfigs() []*OverrideConfig {

api/mesh/v1alpha1/traffic_helper.go

Lines changed: 0 additions & 68 deletions
This file was deleted.

api/mesh/v1alpha1/zk_config.pb.go

Lines changed: 145 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/mesh/v1alpha1/zk_config.proto

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
syntax = "proto3";
2+
3+
package dubbo.mesh.v1alpha1;
4+
5+
option go_package = "github.com/apache/dubbo-admin/api/mesh/v1alpha1";
6+
7+
import "api/mesh/options.proto";
8+
9+
message ZKConfig {
10+
option (dubbo.mesh.resource).name = "ZKConfig";
11+
option (dubbo.mesh.resource).plural_name = "ZKConfig";
12+
option (dubbo.mesh.resource).package = "mesh";
13+
option (dubbo.mesh.resource).is_experimental = true;
14+
15+
string nodeName = 1;
16+
17+
string nodeData = 2;
18+
}

api/mesh/v1alpha1/zk_metadata.pb.go

Lines changed: 145 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)