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/09 17:57:05 UTC
[1/4] incubator-trafficcontrol git commit: This closes #553
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 0ecda947d -> bc4ce954d
This closes #553
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bc4ce954
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bc4ce954
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bc4ce954
Branch: refs/heads/master
Commit: bc4ce954dcd735f2509072262b4ab159a9d7aa10
Parents: dd8cb28
Author: Dewayne Richardson <de...@apache.org>
Authored: Tue May 9 11:56:59 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 9 11:56:59 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/4] incubator-trafficcontrol git commit: reduce the amount of code
Posted by de...@apache.org.
reduce the amount of code
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/54f2b0c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/54f2b0c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/54f2b0c2
Branch: refs/heads/master
Commit: 54f2b0c29a020a4f4d5b604355c048e3318fa58d
Parents: ea085f0
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Mon May 8 12:17:35 2017 -0400
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 9 11:56:59 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/Server.pm | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/54f2b0c2/traffic_ops/app/lib/UI/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Server.pm b/traffic_ops/app/lib/UI/Server.pm
index a3be22c..2988af7 100644
--- a/traffic_ops/app/lib/UI/Server.pm
+++ b/traffic_ops/app/lib/UI/Server.pm
@@ -987,12 +987,9 @@ sub postupdate {
#Parameters don't have boolean options at this time, so we're going to compare against the default string value of 0.
if ( defined($use_reval_pending) && $use_reval_pending ne '0' && defined($reval_updated) ) {
- $update_server->update( { upd_pending => $updated } );
$update_server->update( { reval_pending => $reval_updated } );
}
- else {
- $update_server->update( { upd_pending => $updated } );
- }
+ $update_server->update( { upd_pending => $updated } );
$self->render( text => "Success", layout=>undef);
[3/4] incubator-trafficcontrol git commit: collapse the DB updates
into one update only
Posted by de...@apache.org.
collapse the DB updates into one update only
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/dd8cb28d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/dd8cb28d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/dd8cb28d
Branch: refs/heads/master
Commit: dd8cb28d94b943998cb0393baa1fc04016e4c846
Parents: 54f2b0c
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Mon May 8 13:01:44 2017 -0400
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 9 11:56:59 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/Server.pm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dd8cb28d/traffic_ops/app/lib/UI/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Server.pm b/traffic_ops/app/lib/UI/Server.pm
index 2988af7..20f2f12 100644
--- a/traffic_ops/app/lib/UI/Server.pm
+++ b/traffic_ops/app/lib/UI/Server.pm
@@ -987,9 +987,11 @@ sub postupdate {
#Parameters don't have boolean options at this time, so we're going to compare against the default string value of 0.
if ( defined($use_reval_pending) && $use_reval_pending ne '0' && defined($reval_updated) ) {
- $update_server->update( { reval_pending => $reval_updated } );
+ $update_server->update( { reval_pending => $reval_updated, upd_pending => $updated } );
+ }
+ else {
+ $update_server->update( { upd_pending => $updated } );
}
- $update_server->update( { upd_pending => $updated } );
$self->render( text => "Success", layout=>undef);
[4/4] incubator-trafficcontrol git commit: prevents DB error when
using older syncds versions with reval pending enabled
Posted by de...@apache.org.
prevents DB error when using older syncds versions with reval pending enabled
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/ea085f0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ea085f0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ea085f0d
Branch: refs/heads/master
Commit: ea085f0d25b47bd16548ff99b4a388fdd4091fc4
Parents: 0ecda94
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Mon May 8 07:53:31 2017 -0400
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 9 11:56:59 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/Server.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ea085f0d/traffic_ops/app/lib/UI/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Server.pm b/traffic_ops/app/lib/UI/Server.pm
index adfc10f..a3be22c 100644
--- a/traffic_ops/app/lib/UI/Server.pm
+++ b/traffic_ops/app/lib/UI/Server.pm
@@ -986,7 +986,7 @@ sub postupdate {
my $use_reval_pending = $self->db->resultset('Parameter')->search( { -and => [ 'name' => 'use_reval_pending', 'config_file' => 'global' ] } )->get_column('value')->single;
#Parameters don't have boolean options at this time, so we're going to compare against the default string value of 0.
- if ( defined($use_reval_pending) && $use_reval_pending ne '0' ) {
+ if ( defined($use_reval_pending) && $use_reval_pending ne '0' && defined($reval_updated) ) {
$update_server->update( { upd_pending => $updated } );
$update_server->update( { reval_pending => $reval_updated } );
}