diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-24 08:40:52 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-24 08:40:52 -0400 |
| commit | 69304fb54da5300941a49364e4344c2c65e654d6 (patch) | |
| tree | de20c2e8a479ae3d13bcd21abc3dff067afa602e /model/cluster_discovery.go | |
| parent | e46b94fa66c029b9a493fdc6ff7bcb98e9651568 (diff) | |
| parent | 47f3c064db885c2cb2e75c195ea24e2ef687891d (diff) | |
| download | chat-69304fb54da5300941a49364e4344c2c65e654d6.tar.gz chat-69304fb54da5300941a49364e4344c2c65e654d6.tar.bz2 chat-69304fb54da5300941a49364e4344c2c65e654d6.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'model/cluster_discovery.go')
| -rw-r--r-- | model/cluster_discovery.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/model/cluster_discovery.go b/model/cluster_discovery.go index 89e5fc95e..5d5b0465d 100644 --- a/model/cluster_discovery.go +++ b/model/cluster_discovery.go @@ -86,7 +86,7 @@ func FilterClusterDiscovery(vs []*ClusterDiscovery, f func(*ClusterDiscovery) bo func (o *ClusterDiscovery) IsValid() *AppError { if len(o.Id) != 26 { - return NewAppError("Channel.IsValid", "model.channel.is_valid.id.app_error", nil, "", http.StatusBadRequest) + return NewAppError("ClusterDiscovery.IsValid", "model.cluster.is_valid.id.app_error", nil, "", http.StatusBadRequest) } if len(o.ClusterName) == 0 { |