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 7ecb0320d3d81c597bb13134c58b773a144410c0
Author: Dewayne Richardson <dewr...@apache.org>
AuthorDate: Thu Feb 22 08:11:25 2018 -0700
fixed merge conflict
---
traffic_ops/traffic_ops_golang/cdn/cdns.go | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/traffic_ops/traffic_ops_golang/cdn/cdns.go
b/traffic_ops/traffic_ops_golang/cdn/cdns.go
index 5366140..4639390 100644
--- a/traffic_ops/traffic_ops_golang/cdn/cdns.go
+++ b/traffic_ops/traffic_ops_golang/cdn/cdns.go
@@ -179,18 +179,6 @@ func (cdn *TOCDN) Read(db *sqlx.DB, parameters
map[string]string, user auth.Curr
return CDNs, []error{}, tc.NoError
}
-func selectCDNsQuery() string {
- query := `SELECT
-dnssec_enabled,
-domain_name,
-id,
-last_updated,
-name
-
-FROM cdn c`
- return query
-}
-
//The TOCDN implementation of the Updater interface
//all implementations of Updater should use transactions and return the proper
errorType
//ParsePQUniqueConstraintError is used to determine if a cdn with conflicting
values exists
@@ -301,6 +289,18 @@ func (cdn *TOCDN) Delete(db *sqlx.DB, user
auth.CurrentUser) (error, tc.ApiError
return nil, tc.NoError
}
+func selectCDNsQuery() string {
+ query := `SELECT
+dnssec_enabled,
+domain_name,
+id,
+last_updated,
+name
+
+FROM cdn c`
+ return query
+}
+
func updateQuery() string {
query := `UPDATE
cdn SET
--
To stop receiving notification emails like this one, please contact
dang...@apache.org.
