Merge branch 'mysql-5.6' into mysql-5.7

prohaska7 · Dec 11, 2017 · 93313f0 · 93313f0
2 parents a6a67f1 + 4082f6b
commit 93313f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packaging/deb-in/copyright.com.in b/packaging/deb-in/copyright.com.in
@@ -4,7 +4,7 @@ Upstream-Contact: MySQL Release Engineering <[email protected]>
 Source: http://dev.mysql.com/
 
 Files: *
-Copyright: 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+Copyright: 2000, 2018, Oracle and/or its affiliates. All rights reserved.
 License: Commercial
  This is a release of MySQL, a dual-license SQL database server.
  For the avoidance of doubt, this particular copy of the software

diff --git a/packaging/deb-in/copyright.gpl.in b/packaging/deb-in/copyright.gpl.in
@@ -3,7 +3,7 @@ Upstream-Name: @DEB_COPYRIGHT_UPSTREAMNAME@
 Upstream-Contact: MySQL Release Engineering <[email protected]>
 Source: http://dev.mysql.com/
 
-Copyright: 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+Copyright: 2000, 2018, Oracle and/or its affiliates. All rights reserved.
 License:
  This is a release of MySQL, a dual-license SQL database server.
  For the avoidance of doubt, this particular copy of the software