[3/3] incubator-trafficcontrol git commit: This closes #57
This closes #57 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/102aab19 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/102aab19 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/102aab19 Branch: refs/heads/psql Commit: 102aab198c0d0fb2f3676b783cf1520749b27e1c Parents: 14177f1 Author: Jeremy Mitchell Authored: Tue Nov 8 08:40:54 2016 -0700 Committer: Jeremy Mitchell Committed: Tue Nov 8 08:40:54 2016 -0700 -- --
[2/3] incubator-trafficcontrol git commit: Merge branch 'fix/ds_orderby' of https://github.com/dewrich/incubator-trafficcontrol into psql
Merge branch 'fix/ds_orderby' of https://github.com/dewrich/incubator-trafficcontrol into psql Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/14177f18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/14177f18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/14177f18 Branch: refs/heads/psql Commit: 14177f18ea5137a1b229122631960511efb88e21 Parents: 0604f36 5fa71c6 Author: Jeremy Mitchell Authored: Tue Nov 8 08:38:47 2016 -0700 Committer: Jeremy Mitchell Committed: Tue Nov 8 08:38:47 2016 -0700 -- traffic_ops/app/lib/API/Deliveryservice.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/14177f18/traffic_ops/app/lib/API/Deliveryservice.pm --
[1/3] incubator-trafficcontrol git commit: Fix for Issue #TC-33
Repository: incubator-trafficcontrol Updated Branches: refs/heads/psql 0604f3699 -> 102aab198 Fix for Issue #TC-33 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5fa71c63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5fa71c63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5fa71c63 Branch: refs/heads/psql Commit: 5fa71c6388f42b9c4e746bf69c1d15b7f2a21789 Parents: 9102176 Author: Dewayne Richardson Authored: Mon Nov 7 13:23:59 2016 -0700 Committer: Dewayne Richardson Committed: Mon Nov 7 13:23:59 2016 -0700 -- traffic_ops/app/lib/API/Deliveryservice.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5fa71c63/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 8a69e00..a56c892 100644 --- a/traffic_ops/app/lib/API/Deliveryservice.pm +++ b/traffic_ops/app/lib/API/Deliveryservice.pm @@ -32,7 +32,7 @@ use Validate::Tiny ':all'; sub index { my $self = shift; - my $orderby = $self->param('orderby') || "xml_id"; + my $orderby = "xml_id"; my $logs_enabled = $self->param('logsEnabled'); my $current_user = $self->current_user()->{username}; my @data;
[1/3] incubator-trafficcontrol git commit: add apache license
Repository: incubator-trafficcontrol Updated Branches: refs/heads/1.8.x 262dd5937 -> e6302917c add apache license (cherry picked from commit 68e47501960dd6d1dbb6cd2ecaf37e7c421fe33a) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/29969196 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/29969196 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/29969196 Branch: refs/heads/1.8.x Commit: 29969196f53878d184bb489dba6b887b0cef77b0 Parents: 209cd69 Author: Dan Kirkwood Authored: Thu Nov 3 21:04:21 2016 -0600 Committer: Dan Kirkwood Committed: Tue Nov 8 09:38:23 2016 -0700 -- traffic_ops/experimental/ui/build/Dockerfile | 18 +- 1 file changed, 17 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/29969196/traffic_ops/experimental/ui/build/Dockerfile -- diff --git a/traffic_ops/experimental/ui/build/Dockerfile b/traffic_ops/experimental/ui/build/Dockerfile index a26278e..ccaebc7 100644 --- a/traffic_ops/experimental/ui/build/Dockerfile +++ b/traffic_ops/experimental/ui/build/Dockerfile @@ -1,5 +1,21 @@ -FROM centos:7 +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +FROM centos:7 MAINTAINER Dan Kirkwood RUNyum -y install \
[3/3] incubator-trafficcontrol git commit: This closes #59.
This closes #59. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e6302917 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e6302917 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e6302917 Branch: refs/heads/1.8.x Commit: e6302917cd216f77d44bd2535b1abd9f59d6e9e8 Parents: 2996919 Author: Dan Kirkwood Authored: Tue Nov 8 09:40:49 2016 -0700 Committer: Dan Kirkwood Committed: Tue Nov 8 09:40:49 2016 -0700 -- --
[2/3] incubator-trafficcontrol git commit: add Apache license
add Apache license (cherry picked from commit 04b83eb86d39f33837fb6447e70420b0ccc65e4d) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/209cd69d Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/209cd69d Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/209cd69d Branch: refs/heads/1.8.x Commit: 209cd69d1f16c183a368a8c3f181e6cec12d43c4 Parents: 262dd59 Author: Dan Kirkwood Authored: Wed Nov 2 11:41:00 2016 -0600 Committer: Dan Kirkwood Committed: Tue Nov 8 09:38:23 2016 -0700 -- .../docker/build/Dockerfile-traffic_monitor | 16 infrastructure/docker/build/Dockerfile-traffic_ops | 16 .../docker/build/Dockerfile-traffic_portal | 16 .../docker/build/Dockerfile-traffic_router | 16 .../docker/build/Dockerfile-traffic_stats | 16 infrastructure/docker/build/docker-compose.yml | 16 infrastructure/docker/build/run-build.sh| 16 infrastructure/docker/traffic_monitor/Dockerfile| 16 infrastructure/docker/traffic_monitor/run.sh| 16 infrastructure/docker/traffic_ops/Dockerfile| 16 infrastructure/docker/traffic_ops/run.sh| 16 infrastructure/docker/traffic_router/Dockerfile | 16 infrastructure/docker/traffic_router/run.sh | 16 .../docker/traffic_server_edge/Dockerfile | 16 infrastructure/docker/traffic_server_edge/run.sh| 16 infrastructure/docker/traffic_server_mid/Dockerfile | 16 infrastructure/docker/traffic_server_mid/run.sh | 16 infrastructure/docker/traffic_stats/Dockerfile | 16 infrastructure/docker/traffic_stats/run.sh | 16 infrastructure/docker/traffic_vault/Dockerfile | 16 infrastructure/docker/traffic_vault/run.sh | 16 21 files changed, 336 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/209cd69d/infrastructure/docker/build/Dockerfile-traffic_monitor -- diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor index ec8aa69..a97aaed 100644 --- a/infrastructure/docker/build/Dockerfile-traffic_monitor +++ b/infrastructure/docker/build/Dockerfile-traffic_monitor @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. FROM centos:7 MAINTAINER Dan Kirkwood http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/209cd69d/infrastructure/docker/build/Dockerfile-traffic_ops -- diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops index 9ab2b0a..24878c7 100644 --- a/infrastructure/docker/build/Dockerfile-traffic_ops +++ b/infrastructure/docker/build/Dockerfile-traffic_ops @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limit
[1/2] incubator-trafficcontrol git commit: use apache git path in release.pl
Repository: incubator-trafficcontrol Updated Branches: refs/heads/1.8.x e6302917c -> bebf63eed use apache git path in release.pl (cherry picked from commit 6ba77187a2b5c25f50a1cd2a1e44ec702e2acdfd) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/514510d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/514510d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/514510d5 Branch: refs/heads/1.8.x Commit: 514510d5791d11ddab5b7cdfe8bbe589e9a0b7f8 Parents: e630291 Author: Dan Kirkwood Authored: Wed Nov 2 13:53:01 2016 -0600 Committer: Dan Kirkwood Committed: Tue Nov 8 11:07:40 2016 -0700 -- misc/release.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/514510d5/misc/release.pl -- diff --git a/misc/release.pl b/misc/release.pl index f5bd0a2..e46e443 100755 --- a/misc/release.pl +++ b/misc/release.pl @@ -32,7 +32,7 @@ my $usage = "\n" . "--gpg-key - Your gpg-key id. ie: 774ACED1\n" . "--release-no - The release-no name you want to cut. ie: 1.1.0\n" . "--git-hash - (optional) The git hash that will be used to reference the release. ie: da4aab57d \n" - . "--git-remote-url - (optional) Overrides the git repo URL where the release will be pulled and sent (mostly for testing). ie: git\@github.com:yourrepo/traffic_control.git \n" + . "--git-remote-url - (optional) Overrides the git repo URL where the release will be pulled and sent (mostly for testing). ie: git\@github.com:yourrepo/incubator-trafficcontrol.git \n" . "--dry-run - (optional) Simulation mode which will NOT apply any changes. \n" . "--debug- (optional) Show debug output\n" . "\nArguments: \n\n" @@ -43,7 +43,7 @@ my $usage = "\n" my $git_remote_name = 'official'; #my $git_remote_url = 'g...@github.com:Comcast/traffic_control.git'; -my $git_remote_url = 'g...@github.com:Comcast/traffic_control.git'; +my $git_remote_url = 'https://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol.git'; my $gpg_key; my $release_no; @@ -206,7 +206,7 @@ sub check_branch_exists { sub clone_repo_to_tmp { my $tmp_dir = "/tmp"; - my $tc_dir = "traffic_control"; + my $tc_dir = "incubator-trafficcontrol"; $working_dir = sprintf( "%s/%s", $tmp_dir, $tc_dir ); remove_tree($working_dir); chdir $tmp_dir;
[2/2] incubator-trafficcontrol git commit: This closes #63
This closes #63 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bebf63ee Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bebf63ee Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bebf63ee Branch: refs/heads/1.8.x Commit: bebf63eedce2d3912752c65b0d52d739f820e0ac Parents: 514510d Author: Dan Kirkwood Authored: Tue Nov 8 11:08:20 2016 -0700 Committer: Dan Kirkwood Committed: Tue Nov 8 11:08:20 2016 -0700 -- --
[1/2] incubator-trafficcontrol git commit: TC-35: Add trafficserver diff for trafficserver-5.3.2.ee14bbe
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 6c58d878a -> e15a0d475 TC-35: Add trafficserver diff for trafficserver-5.3.2.ee14bbe Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8fb67b46 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8fb67b46 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8fb67b46 Branch: refs/heads/master Commit: 8fb67b4612f7c69130078a0bad18cf863622c632 Parents: 6c58d87 Author: John Rushford Authored: Tue Nov 8 11:09:15 2016 -0700 Committer: John Rushford Committed: Tue Nov 8 11:09:15 2016 -0700 -- .../patches/trafficserver-5.3.2-ee14bbe.diff| 673 +++ 1 file changed, 673 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8fb67b46/traffic_server/patches/trafficserver-5.3.2-ee14bbe.diff -- diff --git a/traffic_server/patches/trafficserver-5.3.2-ee14bbe.diff b/traffic_server/patches/trafficserver-5.3.2-ee14bbe.diff new file mode 100644 index 000..e28e787 --- /dev/null +++ b/traffic_server/patches/trafficserver-5.3.2-ee14bbe.diff @@ -0,0 +1,673 @@ +diff --git a/configure.ac b/configure.ac +index 2c79ca4..a46a43e 100644 +--- a/configure.ac b/configure.ac +@@ -1960,6 +1960,7 @@ AS_IF([test "x$enable_experimental_plugins" = xyes], [ + plugins/experimental/hipes/Makefile + plugins/experimental/metalink/Makefile + plugins/experimental/mysql_remap/Makefile ++plugins/experimental/money_trace/Makefile + plugins/experimental/regex_revalidate/Makefile + plugins/experimental/remap_stats/Makefile + plugins/experimental/s3_auth/Makefile +diff --git a/iocore/aio/AIO.cc b/iocore/aio/AIO.cc +index 4dd1842..5c4b217 100644 +--- a/iocore/aio/AIO.cc b/iocore/aio/AIO.cc +@@ -187,6 +187,10 @@ struct AIOThreadInfo : public Continuation { + { + (void)event; + (void)e; ++#if TS_USE_HWLOC ++hwloc_set_membind_nodeset(ink_get_topology(), hwloc_topology_get_topology_nodeset(ink_get_topology()), HWLOC_MEMBIND_INTERLEAVE, ++ HWLOC_MEMBIND_THREAD); ++#endif + aio_thread_main(this); + return EVENT_DONE; + } +diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc +index a7f5c55..8a21a70 100644 +--- a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc +@@ -1470,6 +1470,12 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e) + // @c lookup_done should always return a valid value so @a r should be null @c NULL. + ink_assert(r && r->app.allotment.application1 == 0 && r->app.allotment.application2 == 0); + ++// lookup_done() returned null due to full hostdb database. ++if (!r) { ++ Debug("hostdb", "HostDBInfo pointer 'r' is NULL"); ++ failed = true; ++} ++ + if (rr) { + const int rrsize = HostDBRoundRobin::size(n, e->srv_hosts.srv_hosts_length); + HostDBRoundRobin *rr_data = (HostDBRoundRobin *)hostDB.alloc(&r->app.rr.offset, rrsize); +diff --git a/mgmt/api/TSControlMain.cc b/mgmt/api/TSControlMain.cc +index a771ca3..a3e64a4 100644 +--- a/mgmt/api/TSControlMain.cc b/mgmt/api/TSControlMain.cc +@@ -967,7 +967,7 @@ handle_stats_reset(int fd, void *req, size_t reqlen) + MgmtMarshallInt err; + + err = recv_mgmt_request(req, reqlen, STATS_RESET_NODE, &optype, &name); +- if (err != TS_ERR_OKAY) { ++ if (err == TS_ERR_OKAY) { + err = StatsReset(optype == STATS_RESET_CLUSTER, name); + } + +diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am +index adb6da8..8f5d48e 100644 +--- a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am +@@ -33,6 +33,7 @@ SUBDIRS = \ + healthchecks \ + hipes \ + metalink \ ++ money_trace \ + regex_revalidate \ + remap_stats \ + s3_auth \ +diff --git a/plugins/experimental/money_trace/money_trace.cc b/plugins/experimental/money_trace/money_trace.cc +index adb8980..09f8cd4 100644 +--- a/plugins/experimental/money_trace/money_trace.cc b/plugins/experimental/money_trace/money_trace.cc +@@ -71,7 +71,7 @@ freeTransactionData(struct txndata *txn_data) + + /** + * The TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE event callback. +- * ++ * + * If there is a cache hit only schedule a TS_HTTP_SEND_RESPONSE_HDR_HOOK + * continuation to send back the money trace header in the response to the + * client. +@@ -79,7 +79,7 @@ freeTransactionData(struct txndata *txn_data) + * If there is a cache miss, a new money trace header is created and a + * TS_HTTP_SEND_REQUES_HDR_HOOK continuation is scheduled to add the + * new money trace header to the parent request. +- */ ++ */ + static void + mt_cache_lookup_check(TSCont contp, TSHttpTx
[2/2] incubator-trafficcontrol git commit: This closes #64
This closes #64 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e15a0d47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e15a0d47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e15a0d47 Branch: refs/heads/master Commit: e15a0d47531d599d07cde269fabd3110514589f8 Parents: 8fb67b4 Author: Eric Friedrich Authored: Tue Nov 8 14:15:01 2016 -0500 Committer: Eric Friedrich Committed: Tue Nov 8 14:15:01 2016 -0500 -- --
[incubator-trafficcontrol] Git Push Summary
Repository: incubator-trafficcontrol Updated Tags: refs/tags/RELEASE-1.8.0-RC1 [created] c336ec5d7
[2/2] incubator-trafficcontrol git commit: This closes #61
This closes #61 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d1fb679e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d1fb679e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d1fb679e Branch: refs/heads/master Commit: d1fb679e7bf04e340ea370cda14ba192579be629 Parents: f3e13b6 Author: Jeremy Mitchell Authored: Tue Nov 8 14:29:23 2016 -0700 Committer: Jeremy Mitchell Committed: Tue Nov 8 14:29:23 2016 -0700 -- --
[1/2] incubator-trafficcontrol git commit: TC-34, fixed and issue where Traffic Ops would return a 4xx error when getting ssl keys for a DS with a period in the xml_id
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master e15a0d475 -> d1fb679e7 TC-34, fixed and issue where Traffic Ops would return a 4xx error when getting ssl keys for a DS with a period in the xml_id Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/f3e13b6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/f3e13b6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/f3e13b6b Branch: refs/heads/master Commit: f3e13b6b3a0980f6bea7f962d7410835584b4024 Parents: e15a0d4 Author: Dave Neuman Authored: Mon Nov 7 15:00:41 2016 -0700 Committer: Jeremy Mitchell Committed: Tue Nov 8 14:28:11 2016 -0700 -- traffic_ops/app/lib/TrafficOpsRoutes.pm | 2 +- traffic_ops/app/script/update_riak_for_search.pl | 1 + traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t | 7 +++ 3 files changed, 9 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/f3e13b6b/traffic_ops/app/lib/TrafficOpsRoutes.pm -- diff --git a/traffic_ops/app/lib/TrafficOpsRoutes.pm b/traffic_ops/app/lib/TrafficOpsRoutes.pm index 0534318..9d0e546 100644 --- a/traffic_ops/app/lib/TrafficOpsRoutes.pm +++ b/traffic_ops/app/lib/TrafficOpsRoutes.pm @@ -515,7 +515,7 @@ sub api_routes { # -- DELIVERYSERVICE: SSL KEYS # Support for SSL private keys, certs, and csrs # gets the latest key by default unless a version query param is provided with ?version=x - $r->get("/api/$version/deliveryservices/xmlId/:xmlid/sslkeys")->over( authenticated => 1 ) + $r->get("/api/$version/deliveryservices/xmlId/#xmlid/sslkeys")->over( authenticated => 1 ) ->to( 'SslKeys#view_by_xml_id', namespace => 'API::DeliveryService' ); $r->get("/api/$version/deliveryservices/hostname/#hostname/sslkeys")->over( authenticated => 1 ) ->to( 'SslKeys#view_by_hostname', namespace => 'API::DeliveryService' ); http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/f3e13b6b/traffic_ops/app/script/update_riak_for_search.pl -- diff --git a/traffic_ops/app/script/update_riak_for_search.pl b/traffic_ops/app/script/update_riak_for_search.pl index 5eb2950..6cfe6d5 100755 --- a/traffic_ops/app/script/update_riak_for_search.pl +++ b/traffic_ops/app/script/update_riak_for_search.pl @@ -39,6 +39,7 @@ foreach my $ds (@$dss) { if ($ds->{protocol} > 0) { my $xml_id = $ds->{xmlId}; my $cdn = $ds->{cdnName}; + print "Updating record for: $xml_id\n"; my $record = &get_riak_record($xml_id, $to_url, $ua); if (!defined($record)) { next; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/f3e13b6b/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 ce36467..ad33a43 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 @@ -138,6 +138,13 @@ ok $t->get_ok("/api/1.1/deliveryservices/xmlId/$key/sslkeys.json")->json_has("/r ->json_is( "/response/version" => $version )->json_is( "/response/country" => $country )->json_is( "/response/hostname" => $hostname )->status_is(200) ->or( sub { diag $t->tx->res->content->asset->{content}; } ); +# #get key with period +ok $t->get_ok("/api/1.1/deliveryservices/xmlId/foo.bar/sslkeys.json")->json_has("/response")->json_has("/response/certificate/csr") + ->json_has("/response/certificate/key")->json_has("/response/certificate/crt")->json_is( "/response/organization" => $org ) + ->json_is( "/response/state" => $state )->json_is( "/response/city" => $city )->json_is( "/response/businessUnit" => $unit ) + ->json_is( "/response/version" => $version )->json_is( "/response/country" => $country )->json_is( "/response/hostname" => $hostname )->status_is(200) + ->or( sub { diag $t->tx->res->content->asset->{content}; } ); + #get key by hostname my $gen_hostname = "edge.foo.top.kabletown.com"; ok $t->get_ok("/api/1.1/deliveryservices/hostname/$gen_hostname/sslkeys.json")->json_has("/response")->json_has("/response/certificate/csr")
svn commit: r16912 - /dev/incubator/trafficcontrol/1.8.0/RC1/
Author: dangogh Date: Tue Nov 8 21:51:47 2016 New Revision: 16912 Log: rpm files for 1.8.0-RC1 Added: dev/incubator/trafficcontrol/1.8.0/RC1/ dev/incubator/trafficcontrol/1.8.0/RC1/traffic_monitor-1.8.0-4549.bebf63ee.el6.x86_64.rpm (with props) dev/incubator/trafficcontrol/1.8.0/RC1/traffic_ops-1.8.0-4549.bebf63ee.el6.src.rpm (with props) dev/incubator/trafficcontrol/1.8.0/RC1/traffic_ops-1.8.0-4549.bebf63ee.el6.x86_64.rpm (with props) dev/incubator/trafficcontrol/1.8.0/RC1/traffic_ops_ort-1.8.0-4549.bebf63ee.el6.src.rpm (with props) dev/incubator/trafficcontrol/1.8.0/RC1/traffic_ops_ort-1.8.0-4549.bebf63ee.el6.x86_64.rpm (with props) dev/incubator/trafficcontrol/1.8.0/RC1/traffic_portal-1.8.0-4549.bebf63ee.el6.src.rpm (with props) dev/incubator/trafficcontrol/1.8.0/RC1/traffic_portal-1.8.0-4549.bebf63ee.el6.x86_64.rpm (with props) dev/incubator/trafficcontrol/1.8.0/RC1/traffic_router-1.8.0-4549.bebf63ee.el6.x86_64.rpm (with props) dev/incubator/trafficcontrol/1.8.0/RC1/traffic_stats-1.8.0-4549.bebf63ee.el6.src.rpm (with props) dev/incubator/trafficcontrol/1.8.0/RC1/traffic_stats-1.8.0-4549.bebf63ee.el6.x86_64.rpm (with props) Added: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_monitor-1.8.0-4549.bebf63ee.el6.x86_64.rpm == Binary file - no diff available. Propchange: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_monitor-1.8.0-4549.bebf63ee.el6.x86_64.rpm -- svn:mime-type = application/octet-stream Added: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_ops-1.8.0-4549.bebf63ee.el6.src.rpm == Binary file - no diff available. Propchange: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_ops-1.8.0-4549.bebf63ee.el6.src.rpm -- svn:mime-type = application/octet-stream Added: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_ops-1.8.0-4549.bebf63ee.el6.x86_64.rpm == Binary file - no diff available. Propchange: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_ops-1.8.0-4549.bebf63ee.el6.x86_64.rpm -- svn:mime-type = application/octet-stream Added: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_ops_ort-1.8.0-4549.bebf63ee.el6.src.rpm == Binary file - no diff available. Propchange: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_ops_ort-1.8.0-4549.bebf63ee.el6.src.rpm -- svn:mime-type = application/octet-stream Added: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_ops_ort-1.8.0-4549.bebf63ee.el6.x86_64.rpm == Binary file - no diff available. Propchange: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_ops_ort-1.8.0-4549.bebf63ee.el6.x86_64.rpm -- svn:mime-type = application/octet-stream Added: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_portal-1.8.0-4549.bebf63ee.el6.src.rpm == Binary file - no diff available. Propchange: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_portal-1.8.0-4549.bebf63ee.el6.src.rpm -- svn:mime-type = application/octet-stream Added: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_portal-1.8.0-4549.bebf63ee.el6.x86_64.rpm == Binary file - no diff available. Propchange: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_portal-1.8.0-4549.bebf63ee.el6.x86_64.rpm -- svn:mime-type = application/octet-stream Added: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_router-1.8.0-4549.bebf63ee.el6.x86_64.rpm == Binary file - no diff available. Propchange: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_router-1.8.0-4549.bebf63ee.el6.x86_64.rpm -- svn:mime-type = application/octet-stream Added: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_stats-1.8.0-4549.bebf63ee.el6.src.rpm == Binary file - no diff available. Propchange: dev/incubator/trafficcontrol/1.8.0/RC1/traffic_stats-1.8.0-4549.bebf63ee.el
[1/2] incubator-trafficcontrol git commit: added Brian Luke as a contributor
Repository: incubator-trafficcontrol Updated Branches: refs/heads/master d1fb679e7 -> a046d7d67 added Brian Luke as a contributor Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/058b9750 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/058b9750 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/058b9750 Branch: refs/heads/master Commit: 058b97509c95db44ca272b4367522bab0dda8f8c Parents: d1fb679 Author: Dewayne Richardson Authored: Tue Nov 8 14:50:42 2016 -0700 Committer: Jeremy Mitchell Committed: Tue Nov 8 14:54:41 2016 -0700 -- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/058b9750/CONTRIBUTORS.md -- diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 36db523..263d074 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1,6 +1,7 @@ Sorted alphabetically * **[Alejandro Bueno (abueno001)] (https://github.com/abueno001)** +* **[Brian Luke (bluke7922)] (https://github.com/bluke7922)** * **[Carol Stemley (cstemley)] (https://github.com/cstemley)** * **[Crystal Qian (cjqian)](https://github.com/cjqian)** * **[Dan Kirkwood (dangogh)](https://github.com/dangogh)**
[2/2] incubator-trafficcontrol git commit: This closes #65
This closes #65 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a046d7d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a046d7d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a046d7d6 Branch: refs/heads/master Commit: a046d7d679d50e57c23a9268bd88cd6b4344f1e2 Parents: 058b975 Author: Jeremy Mitchell Authored: Tue Nov 8 14:55:15 2016 -0700 Committer: Jeremy Mitchell Committed: Tue Nov 8 14:56:26 2016 -0700 -- --