You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/05/30 16:05:46 UTC
[1/2] incubator-trafficcontrol git commit: This closes #607
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 8f3b58a48 -> 805dbf696
This closes #607
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/805dbf69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/805dbf69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/805dbf69
Branch: refs/heads/master
Commit: 805dbf69652236c1dbe24066790851f657e0c5d8
Parents: 2d4e104
Author: Dewayne Richardson <de...@apache.org>
Authored: Tue May 30 10:05:48 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 30 10:05:48 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/2] incubator-trafficcontrol git commit: removes column name
ambiguity
Posted by de...@apache.org.
removes column name ambiguity
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2d4e1046
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2d4e1046
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2d4e1046
Branch: refs/heads/master
Commit: 2d4e104661e6b417a207b11f142488fe3bb68405
Parents: 8f3b58a
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed May 24 09:47:20 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 30 10:05:48 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/API/Deliveryservice.pm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2d4e1046/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 a215fd3..2017e42 100644
--- a/traffic_ops/app/lib/API/Deliveryservice.pm
+++ b/traffic_ops/app/lib/API/Deliveryservice.pm
@@ -41,16 +41,16 @@ sub index {
my %criteria;
if ( defined $cdn_id ) {
- $criteria{'cdn_id'} = $cdn_id;
+ $criteria{'me.cdn_id'} = $cdn_id;
}
if ( defined $profile_id ) {
- $criteria{'profile'} = $profile_id;
+ $criteria{'me.profile'} = $profile_id;
}
if ( defined $type_id ) {
- $criteria{'type'} = $type_id;
+ $criteria{'me.type'} = $type_id;
}
if ( defined $logs_enabled ) {
- $criteria{'logs_enabled'} = $logs_enabled ? 1 : 0; # converts bool to 0|1
+ $criteria{'me.logs_enabled'} = $logs_enabled ? 1 : 0; # converts bool to 0|1
}
if ( !&is_privileged($self) ) {