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/04/19 17:23:54 UTC
[1/2] incubator-trafficcontrol git commit: This closes #487
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 4feae927e -> 142f94391
This closes #487
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/142f9439
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/142f9439
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/142f9439
Branch: refs/heads/master
Commit: 142f94391cbd89ed009263bd7c06dac38598f9a0
Parents: dc8b754
Author: Dewayne Richardson <de...@apache.org>
Authored: Wed Apr 19 11:23:44 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Wed Apr 19 11:23:44 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/2] incubator-trafficcontrol git commit: if primary parent list is
empty use secondary
Posted by de...@apache.org.
if primary parent list is empty use secondary
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/dc8b7547
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/dc8b7547
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/dc8b7547
Branch: refs/heads/master
Commit: dc8b7547d27c2531295627a83a91f19bde8ae3de
Parents: 4feae92
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Wed Apr 19 13:14:32 2017 -0400
Committer: Dewayne Richardson <de...@apache.org>
Committed: Wed Apr 19 11:23:44 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm | 4 ++++
traffic_ops/app/lib/UI/ConfigFiles.pm | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dc8b7547/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
index 45a0ece..8bb6137 100644
--- a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
+++ b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
@@ -2019,6 +2019,10 @@ sub parent_dot_config {
push @secondary_parent_info, $ptxt;
}
}
+ if ( scalar @parent_info == 0 ) {
+ @parent_info = @secondary_parent_info;
+ @secondary_parent_info = ();
+ }
my %seen;
@parent_info = grep { !$seen{$_}++ } @parent_info;
my $parents = 'parent="' . join( '', @parent_info ) . '"';
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dc8b7547/traffic_ops/app/lib/UI/ConfigFiles.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/ConfigFiles.pm b/traffic_ops/app/lib/UI/ConfigFiles.pm
index d7adb17..a1245bd 100644
--- a/traffic_ops/app/lib/UI/ConfigFiles.pm
+++ b/traffic_ops/app/lib/UI/ConfigFiles.pm
@@ -1226,6 +1226,10 @@ sub parent_dot_config {
push @secondary_parent_info, $ptxt;
}
}
+ if ( scalar @parent_info == 0 ) {
+ @parent_info = @secondary_parent_info;
+ @secondary_parent_info = ();
+ }
my %seen;
@parent_info = grep { !$seen{$_}++ } @parent_info;
my $parents = 'parent="' . join( '', @parent_info ) . '"';