You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2016/11/21 20:39:33 UTC

[1/2] incubator-trafficcontrol git commit: realigned data to fix the Riak based tests

Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/psql-rebase 1392b61ae -> ed699216c


realigned data to fix the Riak based tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7ac91fa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7ac91fa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7ac91fa6

Branch: refs/heads/psql-rebase
Commit: 7ac91fa625c5a1c5a9d702eceb02026b4d3983c8
Parents: 1392b61
Author: Dewayne Richardson <de...@apache.org>
Authored: Mon Nov 21 13:27:56 2016 -0700
Committer: Dewayne Richardson <de...@apache.org>
Committed: Mon Nov 21 13:27:56 2016 -0700

----------------------------------------------------------------------
 traffic_ops/app/t/api/1.1/deliveryservice/keys_url_sig.t | 2 +-
 traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7ac91fa6/traffic_ops/app/t/api/1.1/deliveryservice/keys_url_sig.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/deliveryservice/keys_url_sig.t b/traffic_ops/app/t/api/1.1/deliveryservice/keys_url_sig.t
index b9faee6..7aa4a3e 100644
--- a/traffic_ops/app/t/api/1.1/deliveryservice/keys_url_sig.t
+++ b/traffic_ops/app/t/api/1.1/deliveryservice/keys_url_sig.t
@@ -117,7 +117,7 @@ ok $t->post_ok('/api/1.1/deliveryservices/xmlId/test-ds1/urlkeys/generate')->sta
 	'Can a non-existent DeliveryService url keys for the portal user be regenerated?';
 
 # OFFLINE all riak servers
-my $rs = $schema->resultset('Server')->search( { type => 26 } );
+my $rs = $schema->resultset('Server')->search( { type => 31 } );
 $rs->update_all( { status => 1 } );
 
 ok $t->post_ok('/api/1.1/deliveryservices/xmlId/test-ds1/urlkeys/generate')->status_is(400)

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7ac91fa6/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t b/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t
index b04ee98..4204955 100644
--- a/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t
+++ b/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t
@@ -212,7 +212,7 @@ ok $t->get_ok("/api/1.1/deliveryservices/hostname/foo.fake-ds.kabletown.com/sslk
 	->json_has("A record for ssl key fake-ds-latest could not be found")->or( sub { diag $t->tx->res->content->asset->{content}; } );
 
 # OFFLINE all riak servers
-my $rs = $schema->resultset('Server')->search( { type => 26 } );
+my $rs = $schema->resultset('Server')->search( { type => 31 } );
 $rs->update_all( { status => 3 } );
 
 ok $t->post_ok(


[2/2] incubator-trafficcontrol git commit: This closes #102

Posted by mi...@apache.org.
This closes #102


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/ed699216
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ed699216
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ed699216

Branch: refs/heads/psql-rebase
Commit: ed699216cbbad9b7cc0418d14ccdec68f8ce8a1a
Parents: 7ac91fa
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Mon Nov 21 13:39:26 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Mon Nov 21 13:39:26 2016 -0700

----------------------------------------------------------------------

----------------------------------------------------------------------