This is an automated email from the ASF dual-hosted git repository.
dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 9360cb185762b9ffb88db9c0311c8a74c13c5fe7
Author: Dewayne Richardson <dewr...@apache.org>
AuthorDate: Thu Feb 22 08:14:26 2018 -0700
fixed merge issue
---
traffic_ops/traffic_ops_golang/cdn/cdns.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/traffic_ops/traffic_ops_golang/cdn/cdns.go
b/traffic_ops/traffic_ops_golang/cdn/cdns.go
index 4639390..c1b7510 100644
--- a/traffic_ops/traffic_ops_golang/cdn/cdns.go
+++ b/traffic_ops/traffic_ops_golang/cdn/cdns.go
@@ -156,7 +156,7 @@ func (cdn *TOCDN) Read(db *sqlx.DB, parameters
map[string]string, user auth.Curr
return nil, errs, tc.DataConflictError
}
- query := selectCDNsQuery() + where + orderBy
+ query := selectQuery() + where + orderBy
log.Debugln("Query is ", query)
rows, err := db.NamedQuery(query, queryValues)
@@ -289,7 +289,7 @@ func (cdn *TOCDN) Delete(db *sqlx.DB, user
auth.CurrentUser) (error, tc.ApiError
return nil, tc.NoError
}
-func selectCDNsQuery() string {
+func selectQuery() string {
query := `SELECT
dnssec_enabled,
domain_name,
--
To stop receiving notification emails like this one, please contact
dang...@apache.org.
