You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by fr...@apache.org on 2017/03/15 15:13:05 UTC
[1/2] incubator-trafficcontrol git commit: fixes 2 missLatts (and no
missLong) and casts to float if defined
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/2.0.x b366bebb8 -> 8c841f1d7
fixes 2 missLatts (and no missLong) and casts to float if defined
(cherry picked from commit 246d9b200fe18460fa7cc34fd7473c2b1910e81d)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/092f9e2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/092f9e2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/092f9e2d
Branch: refs/heads/2.0.x
Commit: 092f9e2d78173ca0f6541ea5c1469bc833d96eec
Parents: b366beb
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Mar 14 09:47:52 2017 -0600
Committer: Eric Friedrich <fr...@apache.org>
Committed: Wed Mar 15 11:12:41 2017 -0400
----------------------------------------------------------------------
traffic_ops/app/lib/API/Deliveryservice.pm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/092f9e2d/traffic_ops/app/lib/API/Deliveryservice.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Deliveryservice.pm b/traffic_ops/app/lib/API/Deliveryservice.pm
index d14b1a4..cc81141 100644
--- a/traffic_ops/app/lib/API/Deliveryservice.pm
+++ b/traffic_ops/app/lib/API/Deliveryservice.pm
@@ -91,7 +91,7 @@ sub index {
"maxDnsAnswers" => $row->max_dns_answers,
"midHeaderRewrite" => $row->mid_header_rewrite,
"missLat" => defined($row->miss_lat) ? 0.0 + $row->miss_lat : undef,
- "missLat" => defined($row->miss_long) ? 0.0 + $row->miss_long : undef,
+ "missLong" => defined($row->miss_long) ? 0.0 + $row->miss_long : undef,
"multiSiteOrigin" => \$row->multi_site_origin,
"multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm,
"orgServerFqdn" => $row->org_server_fqdn,
@@ -188,7 +188,7 @@ sub show {
"maxDnsAnswers" => $row->max_dns_answers,
"midHeaderRewrite" => $row->mid_header_rewrite,
"missLat" => defined($row->miss_lat) ? 0.0 + $row->miss_lat : undef,
- "missLat" => defined($row->miss_long) ? 0.0 + $row->miss_long : undef,
+ "missLong" => defined($row->miss_long) ? 0.0 + $row->miss_long : undef,
"multiSiteOrigin" => \$row->multi_site_origin,
"multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm,
"orgServerFqdn" => $row->org_server_fqdn,
@@ -335,8 +335,8 @@ sub update {
"longDesc2" => $rs->long_desc_2,
"maxDnsAnswers" => $rs->max_dns_answers,
"midHeaderRewrite" => $rs->mid_header_rewrite,
- "missLat" => 0.0 + $rs->miss_lat,
- "missLong" => 0.0 + $rs->miss_long,
+ "missLat" => defined($rs->miss_lat) ? 0.0 + $rs->miss_lat : undef,
+ "missLong" => defined($rs->miss_long) ? 0.0 + $rs->miss_long : undef,
"multiSiteOrigin" => $rs->multi_site_origin,
"multiSiteOriginAlgorithm" => $rs->multi_site_origin_algorithm,
"orgServerFqdn" => $rs->org_server_fqdn,
@@ -491,8 +491,8 @@ sub create {
"longDesc2" => $insert->long_desc_2,
"maxDnsAnswers" => $insert->max_dns_answers,
"midHeaderRewrite" => $insert->mid_header_rewrite,
- "missLat" => $insert->miss_lat,
- "missLong" => $insert->miss_long,
+ "missLat" => defined($insert->miss_lat) ? 0.0 + $insert->miss_lat : undef,
+ "missLong" => defined($insert->miss_long) ? 0.0 + $insert->miss_long : undef,
"multiSiteOrigin" => $insert->multi_site_origin,
"multiSiteOriginAlgorithm" => $insert->multi_site_origin_algorithm,
"orgServerFqdn" => $insert->org_server_fqdn,
@@ -604,8 +604,8 @@ sub get_deliveryservices_by_serverId {
"longDesc2" => $row->long_desc_2,
"maxDnsAnswers" => $row->max_dns_answers,
"midHeaderRewrite" => $row->mid_header_rewrite,
- "missLat" => $row->miss_lat,
- "missLong" => $row->miss_long,
+ "missLat" => defined($row->miss_lat) ? 0.0 + $row->miss_lat : undef,
+ "missLong" => defined($row->miss_long) ? 0.0 + $row->miss_long : undef,
"multiSiteOrigin" => \$row->multi_site_origin,
"multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm,
"orgServerFqdn" => $row->org_server_fqdn,
@@ -679,8 +679,8 @@ sub get_deliveryservices_by_userId {
"longDesc2" => $row->long_desc_2,
"maxDnsAnswers" => $row->max_dns_answers,
"midHeaderRewrite" => $row->mid_header_rewrite,
- "missLat" => $row->miss_lat,
- "missLong" => $row->miss_long,
+ "missLat" => defined($row->miss_lat) ? 0.0 + $row->miss_lat : undef,
+ "missLong" => defined($row->miss_long) ? 0.0 + $row->miss_long : undef,
"multiSiteOrigin" => \$row->multi_site_origin,
"multiSiteOriginAlgorithm" => $row->multi_site_origin_algorithm,
"orgServerFqdn" => $row->org_server_fqdn,
[2/2] incubator-trafficcontrol git commit: This closes #362
Posted by fr...@apache.org.
This closes #362
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8c841f1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8c841f1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8c841f1d
Branch: refs/heads/2.0.x
Commit: 8c841f1d703a4c09f99276c5596182b03a56fe91
Parents: 092f9e2
Author: Eric Friedrich <fr...@apache.org>
Authored: Wed Mar 15 11:12:52 2017 -0400
Committer: Eric Friedrich <fr...@apache.org>
Committed: Wed Mar 15 11:12:52 2017 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------