You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2017/08/02 04:17:18 UTC

[trafficserver] branch 6.2.x updated (8911566 -> 0b7b630)

This is an automated email from the ASF dual-hosted git repository.

sorber pushed a change to branch 6.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


    from 8911566  Bump version and update STATUS
     new be719e9  Update changelog.pl to use github instead of Jira
     new 199a572  Make sure we only capture merged PRs
     new 0b7b630  Adding CHANGELOG-6.2.2

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG-6.2.2    |  26 ++++++++
 Makefile.am        |   3 +-
 tools/changelog.pl | 190 +++++++++++++++++++++++++++++++++++++----------------
 3 files changed, 162 insertions(+), 57 deletions(-)
 create mode 100644 CHANGELOG-6.2.2

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].

[trafficserver] 01/03: Update changelog.pl to use github instead of Jira

Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sorber pushed a commit to branch 6.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit be719e948b35389fb3655ddd81b3428b82f7b460
Author: Phil Sorber <so...@apache.org>
AuthorDate: Thu May 4 15:30:47 2017 -0600

    Update changelog.pl to use github instead of Jira
    
    (cherry picked from commit a68cb22faaed4afcbdd2bddd3cb846add7646b3c)
---
 Makefile.am        |   3 +-
 tools/changelog.pl | 124 +++++++++++++++++++++++++++++------------------------
 2 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f088fb8..4c452e3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,8 +54,7 @@ doxygen:
 	@cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
 
 changelog:
-	./tools/changelog.pl $(VERSION) > CHANGELOG-$(VERSION)
-	-git add CHANGELOG-$(VERSION) && git commit -m "Adding CHANGELOG-$(VERSION)"
+	./tools/changelog.pl apache trafficserver $(VERSION) > CHANGELOG-$(VERSION)
 
 asf-dist: asf-distdir
 	tardir=$(distdir) && $(am__tar) --mtime=./configure.ac | bzip2 -9 -c >$(distdir).tar.bz2
diff --git a/tools/changelog.pl b/tools/changelog.pl
index 8ac7fc9..b151a69 100755
--- a/tools/changelog.pl
+++ b/tools/changelog.pl
@@ -22,36 +22,64 @@ use warnings;
 use WWW::Curl::Easy;
 use JSON;
 
-my $fixversion = shift;
-my $url = "https://issues.apache.org/jira";
-my $jql = "project = TS AND status in (Resolved, Closed) AND fixVersion = $fixversion ORDER BY key ASC";
+my $owner = shift;
+my $repo = shift;
+my $milestone = shift;
+my $url = "https://api.github.com";
 
-sub jira_search
+sub milestone_lookup
 {
   my $url = shift;
-  my $jql = shift;
-  my $index = shift;
-  my $endpoint = "/rest/api/2/search";
-
-  my $query = {
-    jql => $jql,
-    startAt => $index,
-    fields => [
-      "summary",
-      "issuetype"
-    ]
-  };
-
-  my $req_body = to_json($query);
+  my $owner = shift;
+  my $repo = shift;
+  my $milestone_title = shift;
+  my $endpoint = "/repos/$owner/$repo/milestones";
+
+  my $params = "state=all";
+
   my $resp_body;
   my $curl = WWW::Curl::Easy->new;
 
-  $curl->setopt(CURLOPT_POST, 1);
-  $curl->setopt(CURLOPT_POSTFIELDS, $req_body);
-  $curl->setopt(CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
-  open(my $fileb, ">", \$resp_body);
-  $curl->setopt(CURLOPT_WRITEDATA, $fileb);
-  $curl->setopt(CURLOPT_URL, $url . $endpoint);
+  #$curl->setopt(CURLOPT_VERBOSE, 1);
+  $curl->setopt(CURLOPT_HTTPHEADER, ['Accept: application/vnd.github.v3+json', 'User-Agent: Awesome-Octocat-App']);
+  $curl->setopt(CURLOPT_WRITEDATA, \$resp_body);
+  $curl->setopt(CURLOPT_URL, $url . $endpoint . '?' . $params);
+
+  my $retcode = $curl->perform();
+  if ($retcode == 0 && $curl->getinfo(CURLINFO_HTTP_CODE) == 200)
+  {
+    my $milestones = from_json($resp_body);
+    foreach my $milestone (@{ $milestones })
+    {
+      if ($milestone->{title} eq $milestone_title)
+      {
+        return $milestone->{number};
+      }
+    }
+  }
+
+  return undef;
+}
+
+sub issue_search
+{
+  my $url = shift;
+  my $owner = shift;
+  my $repo = shift;
+  my $milestone_id = shift;
+  my $page = shift;
+  my $endpoint = "/repos/$owner/$repo/issues";
+
+  my $params = "milestone=$milestone_id&state=closed&page=$page";
+
+  my $resp_body;
+  my $curl = WWW::Curl::Easy->new;
+
+  #$curl->setopt(CURLOPT_VERBOSE, 1);
+  $curl->setopt(CURLOPT_HTTPHEADER, ['Accept: application/vnd.github.v3+json', 'User-Agent: Awesome-Octocat-App']);
+  $curl->setopt(CURLOPT_WRITEDATA, \$resp_body);
+  $curl->setopt(CURLOPT_URL, $url . $endpoint . '?' . $params);
+
   my $retcode = $curl->perform();
   if ($retcode == 0 && $curl->getinfo(CURLINFO_HTTP_CODE) == 200) {
     return from_json($resp_body);
@@ -60,49 +88,35 @@ sub jira_search
   undef;
 }
 
-my $count = 0;
-my $changelog;
-my $issues;
+my $milestone_id = milestone_lookup($url, $owner, $repo, $milestone);
 
-do
+if (!defined($milestone_id))
 {
-  $issues = jira_search($url, $jql, $count);
+  exit 1;
+}
 
-  if (!defined($issues))
-  {
-    exit 1;
-  }
+my $issues;
+my $changelog;
+my $page = 1;
 
-  foreach my $issue (@{ $issues->{issues} })
+do {
+  $issues = issue_search($url, $owner, $repo, $milestone_id, $page);
+  foreach my $issue (@{ $issues })
   {
     if (defined($issue))
     {
-      push @{ $changelog->{$issue->{fields}{issuetype}{name}} }, {key => $issue->{key},  summary => $issue->{fields}{summary}};
-      $count++;
+      push @{ $changelog }, {number => $issue->{number},  title => $issue->{title}};
     }
   }
-}
-while ($count < $issues->{total});
+  $page++;
+} while (scalar @{ $issues });
 
-if (!defined($changelog))
+if (defined($changelog))
 {
-  exit 1;
-}
-
-print "Changes with Apache Traffic Server $fixversion\n";
+  print "Changes with Apache Traffic Server $milestone\n";
 
-foreach my $key (sort keys %{ $changelog })
-{
-  print "\n$key:\n";
-  foreach my $issue (@{ $changelog->{$key} })
+  foreach my $issue (sort {$a->{number} <=> $b->{number}} @{ $changelog })
   {
-    chomp $issue->{summary};
-    $issue->{summary} =~ s/\s+$//; # Trim trailing whitespace
-    print "  *) [$issue->{key}] ";
-    if (length($issue->{summary}) <= (131 - 15)) {
-      print "$issue->{summary}\n";
-    } else {
-      print substr($issue->{summary}, 0, (131 - 18)), "...\n";
-    }
+    print "  #$issue->{number} - $issue->{title}\n";
   }
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.

[trafficserver] 02/03: Make sure we only capture merged PRs

Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sorber pushed a commit to branch 6.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 199a57254e2f1f3bc1a4b22481fd547b9de4cf97
Author: Phil Sorber <so...@apache.org>
AuthorDate: Fri May 5 16:50:54 2017 -0600

    Make sure we only capture merged PRs
    
    (cherry picked from commit f6df9a719fc2182df0dec1734b731d2d3cf3eade)
---
 Makefile.am        |  2 +-
 tools/changelog.pl | 86 +++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4c452e3..fc1fe36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,7 @@ doxygen:
 	@cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
 
 changelog:
-	./tools/changelog.pl apache trafficserver $(VERSION) > CHANGELOG-$(VERSION)
+	./tools/changelog.pl apache trafficserver $(VERSION) $(AUTHTOKEN) > CHANGELOG-$(VERSION)
 
 asf-dist: asf-distdir
 	tardir=$(distdir) && $(am__tar) --mtime=./configure.ac | bzip2 -9 -c >$(distdir).tar.bz2
diff --git a/tools/changelog.pl b/tools/changelog.pl
index b151a69..195e030 100755
--- a/tools/changelog.pl
+++ b/tools/changelog.pl
@@ -25,23 +25,28 @@ use JSON;
 my $owner = shift;
 my $repo = shift;
 my $milestone = shift;
+my $auth = shift;
 my $url = "https://api.github.com";
 
+sub rate_fail
+{
+  print STDERR "You have exceeded your rate limit. Try using an auth token.\n";
+  exit 2;
+}
+
 sub milestone_lookup
 {
+  my $curl = shift;
   my $url = shift;
   my $owner = shift;
   my $repo = shift;
   my $milestone_title = shift;
   my $endpoint = "/repos/$owner/$repo/milestones";
 
-  my $params = "state=all";
+  my $params = "state=closed";
 
   my $resp_body;
-  my $curl = WWW::Curl::Easy->new;
 
-  #$curl->setopt(CURLOPT_VERBOSE, 1);
-  $curl->setopt(CURLOPT_HTTPHEADER, ['Accept: application/vnd.github.v3+json', 'User-Agent: Awesome-Octocat-App']);
   $curl->setopt(CURLOPT_WRITEDATA, \$resp_body);
   $curl->setopt(CURLOPT_URL, $url . $endpoint . '?' . $params);
 
@@ -57,12 +62,43 @@ sub milestone_lookup
       }
     }
   }
+  elsif ($retcode == 0 && $curl->getinfo(CURLINFO_HTTP_CODE) == 403)
+  {
+    rate_fail();
+  }
+
+  undef;
+}
+
+sub is_merged
+{
+  my $curl = shift;
+  my $url = shift;
+  my $owner = shift;
+  my $repo = shift;
+  my $issue_id = shift;
+  my $endpoint = "/repos/$owner/$repo/pulls/$issue_id/merge";
+
+  my $resp_body;
+
+  $curl->setopt(CURLOPT_WRITEDATA, \$resp_body);
+  $curl->setopt(CURLOPT_URL, $url . $endpoint);
+
+  my $retcode = $curl->perform();
+  if ($retcode == 0 && $curl->getinfo(CURLINFO_HTTP_CODE) == 204) {
+    return 1;
+  }
+  elsif ($retcode == 0 && $curl->getinfo(CURLINFO_HTTP_CODE) == 403)
+  {
+    rate_fail();
+  }
 
-  return undef;
+  undef;
 }
 
 sub issue_search
 {
+  my $curl = shift;
   my $url = shift;
   my $owner = shift;
   my $repo = shift;
@@ -73,10 +109,7 @@ sub issue_search
   my $params = "milestone=$milestone_id&state=closed&page=$page";
 
   my $resp_body;
-  my $curl = WWW::Curl::Easy->new;
 
-  #$curl->setopt(CURLOPT_VERBOSE, 1);
-  $curl->setopt(CURLOPT_HTTPHEADER, ['Accept: application/vnd.github.v3+json', 'User-Agent: Awesome-Octocat-App']);
   $curl->setopt(CURLOPT_WRITEDATA, \$resp_body);
   $curl->setopt(CURLOPT_URL, $url . $endpoint . '?' . $params);
 
@@ -84,14 +117,29 @@ sub issue_search
   if ($retcode == 0 && $curl->getinfo(CURLINFO_HTTP_CODE) == 200) {
     return from_json($resp_body);
   }
+  elsif ($retcode == 0 && $curl->getinfo(CURLINFO_HTTP_CODE) == 403)
+  {
+    rate_fail();
+  }
 
   undef;
 }
 
-my $milestone_id = milestone_lookup($url, $owner, $repo, $milestone);
+my $curl = WWW::Curl::Easy->new;
+
+#$curl->setopt(CURLOPT_VERBOSE, 1);
+$curl->setopt(CURLOPT_HTTPHEADER, ['Accept: application/vnd.github.v3+json', 'User-Agent: Awesome-Octocat-App']);
+
+if (defined($auth))
+{
+  $curl->setopt(CURLOPT_USERPWD, $auth);
+}
+
+my $milestone_id = milestone_lookup($curl, $url, $owner, $repo, $milestone);
 
 if (!defined($milestone_id))
 {
+  print STDERR "Milestone not found!\n";
   exit 1;
 }
 
@@ -99,12 +147,30 @@ my $issues;
 my $changelog;
 my $page = 1;
 
+print STDERR "Looking for issues from Milestone $milestone\n";
+
 do {
-  $issues = issue_search($url, $owner, $repo, $milestone_id, $page);
+  print STDERR "Page $page\n";
+  $issues = issue_search($curl, $url, $owner, $repo, $milestone_id, $page);
   foreach my $issue (@{ $issues })
   {
     if (defined($issue))
     {
+      print STDERR "Issue #" . $issue->{number} . " - " . $issue->{title} . " ";
+
+      if (!exists($issue->{pull_request}))
+      {
+        print STDERR "not a PR.\n";
+        next;
+      }
+
+      if (!is_merged($curl, $url, $owner, $repo, $issue->{number}))
+      {
+        print STDERR "not merged.\n";
+        next;
+      }
+
+      print STDERR "added.\n";
       push @{ $changelog }, {number => $issue->{number},  title => $issue->{title}};
     }
   }

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.

[trafficserver] 03/03: Adding CHANGELOG-6.2.2

Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sorber pushed a commit to branch 6.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 0b7b630858b4983d077a63074776abdfa48778f8
Author: Phil Sorber <so...@apache.org>
AuthorDate: Tue Aug 1 22:13:12 2017 -0600

    Adding CHANGELOG-6.2.2
---
 CHANGELOG-6.2.2 | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGELOG-6.2.2 b/CHANGELOG-6.2.2
new file mode 100644
index 0000000..28bf476
--- /dev/null
+++ b/CHANGELOG-6.2.2
@@ -0,0 +1,26 @@
+Changes with Apache Traffic Server 6.2.2
+  #1272 - TS-5104: Correct the calculation of max_dns_lookups in OSDNSLookup
+  #1276 - TS-5105: Do vc->con.setRemote(target) before socksEntry->init()
+  #1321 - 6.2.x TS-4435 and TS-5059: Fixes for building with OpenSSL 1.1
+  #1395 - Update client streams count in Http2ConnectionState::release_stream.
+  #1410 - 6.2.x: TS-4665: H2 not terminating stream with short chunked response
+  #1434 - Clang fixes
+  #1436 - Backport f71b75e and 734aa31 from master to 6.2.x
+  #1440 - Remove nullptr instances that were introduced from upstream backports…
+  #1485 - back port "fix TS-4195: double free when stop trafficserver" to 6.2.x
+  #1509 - TS-5106: Create ParentRoundRobin object as ParentRecord->selection_strategy for default parent proxy server
+  #1513 - TS-4747: make marking parent proxies down in hostdb configurable.
+  #1539 - Signals fix
+  #1541 - retry safe requests
+  #1543 - Remove nullptr instance that was introduced from upstream backport an…
+  #1636 - TS-4195: double free on exit
+  #1709 - Build fixes for Ubuntu 17
+  #1886 - Fix slow leak in traffic_manager caused by un-freed capabilities.
+  #1900 - delay DNS for origin server until it is required
+  #2011 - This should allow for per-version binaries
+  #2301 - Backport PR #1941, fix TLS handshake, to 6.2.x.
+  #2306 - Backport TS-5107
+  #2308 - TS-4375: Fix PCRE link issues on Darwin.
+  #2309 - Unfolds request headers that are using obs continuations
+  #2313 - Fix luajit build vaargs
+  #2316 - Uses an enum class for the Mgmt OpType

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.