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/10 01:30:40 UTC
[1/2] incubator-trafficcontrol git commit: fixed merge for cherry
pick of 9105fe75fafc4bbc15894ca62763297cc52a6870
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/2.0.x 18a61569e -> d1153acb8
fixed merge for cherry pick of 9105fe75fafc4bbc15894ca62763297cc52a6870
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fba148b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fba148b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fba148b3
Branch: refs/heads/2.0.x
Commit: fba148b3dffabb7c6a3c13394cc018fe729c03b5
Parents: 18a6156
Author: Dewayne Richardson <de...@apache.org>
Authored: Thu Mar 9 12:24:45 2017 -0700
Committer: Eric Friedrich <fr...@apache.org>
Committed: Thu Mar 9 20:28:36 2017 -0500
----------------------------------------------------------------------
traffic_ops/bin/traffic_ops_ort.pl | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fba148b3/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index 37f64b0..19cfacf 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -1226,6 +1226,7 @@ sub replace_cfg_file {
. $cfg_file_tracker->{$cfg_file}->{'location'}
. "/$cfg_file\n";
system("/bin/cp $cfg_file_tracker->{$cfg_file}->{'backup_from_trops'} $cfg_file_tracker->{$cfg_file}->{'location'}/$cfg_file");
+ chown $ats_uid, $ats_uid, "$cfg_file_tracker->{$cfg_file}->{'location'}/$cfg_file";
$cfg_file_tracker->{$cfg_file}->{'change_applied'}++;
( $log_level >> $TRACE ) && print "TRACE Setting change applied for $cfg_file.\n";
$return_code = $CFG_FILE_CHANGED;
[2/2] incubator-trafficcontrol git commit: This fixes #342
Posted by fr...@apache.org.
This fixes #342
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d1153acb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d1153acb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d1153acb
Branch: refs/heads/2.0.x
Commit: d1153acb842b53fddaa8a2be63c708e59cb0786f
Parents: fba148b
Author: Eric Friedrich <fr...@apache.org>
Authored: Thu Mar 9 20:29:42 2017 -0500
Committer: Eric Friedrich <fr...@apache.org>
Committed: Thu Mar 9 20:29:42 2017 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------