You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by el...@apache.org on 2017/04/25 17:20:12 UTC
[1/3] incubator-trafficcontrol git commit: accounts for DNS* and
HTTP* types
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 8743b1beb -> 4a96024b7
accounts for DNS* and HTTP* types
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/1d1d9808
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/1d1d9808
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/1d1d9808
Branch: refs/heads/master
Commit: 1d1d9808f7dfd67174501790d97ab9ed22d2ae94
Parents: 8c0c233
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Apr 25 10:28:59 2017 -0600
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Tue Apr 25 11:19:44 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/API/Deliveryservice.pm | 4 ++--
traffic_ops/app/templates/delivery_service/edit.html.ep | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1d1d9808/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 4297bd5..a6523cf 100644
--- a/traffic_ops/app/lib/API/Deliveryservice.pm
+++ b/traffic_ops/app/lib/API/Deliveryservice.pm
@@ -903,10 +903,10 @@ sub state {
my $type = shift(@k);
my $location = undef;
- if ( $type eq "DNS" ) {
+ if ( $type =~ /^DNS/ ) {
$location = $c->{bypassDestination}->{$type}->{ip};
}
- elsif ( $type eq "HTTP" ) {
+ elsif ( $type =~ /^HTTP/ ) {
my $port = ( exists( $c->{bypassDestination}->{$type}->{port} ) ) ? ":" . $c->{bypassDestination}->{$type}->{port} : "";
$location = sprintf( "http://%s%s", $c->{bypassDestination}->{$type}->{fqdn}, $port );
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1d1d9808/traffic_ops/app/templates/delivery_service/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/edit.html.ep b/traffic_ops/app/templates/delivery_service/edit.html.ep
index e828ac6..9e95cae 100644
--- a/traffic_ops/app/templates/delivery_service/edit.html.ep
+++ b/traffic_ops/app/templates/delivery_service/edit.html.ep
@@ -178,7 +178,7 @@
$('#select_re').html("<select id=\"regexp_selector\"> " +
"<option>Add a regex...</option> " +
"<option>Add Host Regexp</option> " +
- % if ($ds->type->name eq "DNS") {
+ % if ($ds->type->name =~ /^DNS/ ) {
"<option disabled>Add Path Regexp</option> " +
"<option disabled>Add Header Regexp</option> " +
% } else {
[2/3] incubator-trafficcontrol git commit: tc-235 - fixes
max_dns_answers for all DNS* types
Posted by el...@apache.org.
tc-235 - fixes max_dns_answers for all DNS* types
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8c0c2333
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8c0c2333
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8c0c2333
Branch: refs/heads/master
Commit: 8c0c2333a796db1bd012c5653084e48e79e01220
Parents: 8743b1b
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Apr 25 10:23:08 2017 -0600
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Tue Apr 25 11:19:44 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/DeliveryService.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8c0c2333/traffic_ops/app/lib/UI/DeliveryService.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/DeliveryService.pm b/traffic_ops/app/lib/UI/DeliveryService.pm
index 262e90b..6e4428f 100644
--- a/traffic_ops/app/lib/UI/DeliveryService.pm
+++ b/traffic_ops/app/lib/UI/DeliveryService.pm
@@ -826,7 +826,7 @@ sub update {
);
my $typename = $self->typename();
- if ( $typename eq "DNS" ) {
+ if ( $typename =~ /^DNS/ ) {
$hash{dns_bypass_ip} = $self->paramAsScalar('ds.dns_bypass_ip');
$hash{dns_bypass_ip6} = $self->paramAsScalar('ds.dns_bypass_ip6');
$hash{dns_bypass_cname} = $self->paramAsScalar('ds.dns_bypass_cname');
[3/3] incubator-trafficcontrol git commit: This closes #513.
Posted by el...@apache.org.
This closes #513.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/4a96024b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/4a96024b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/4a96024b
Branch: refs/heads/master
Commit: 4a96024b7ffc380564bb58eda3156e470f35d077
Parents: 1d1d980
Author: Jeff Elsloo <je...@cable.comcast.com>
Authored: Tue Apr 25 11:20:11 2017 -0600
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Tue Apr 25 11:20:11 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------