[accumulo] 01/01: Merge branch '1.9'

2020-03-08 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 3a61cd23e4ef34cab0bb12474d720a43aee534da
Merge: 91ae9de 99166f1
Author: Christopher Tubbs 
AuthorDate: Sun Mar 8 10:22:33 2020 -0400

Merge branch '1.9'

 NOTICE  | 2 +-
 assemble/src/main/resources/NOTICE  | 2 +-
 server/native/src/main/resources/NOTICE | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

[accumulo] branch master updated (91ae9de -> 3a61cd2)

2020-03-08 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


from 91ae9de  Fix another unused variable warning from #1536
 new 99166f1  Update copyright dates for 2020 releases
 new 3a61cd2  Merge branch '1.9'

The 2 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:
 NOTICE  | 2 +-
 assemble/src/main/resources/NOTICE  | 2 +-
 server/native/src/main/resources/NOTICE | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

[accumulo] branch 1.9 updated: Update copyright dates for 2020 releases

2020-03-08 Thread ctubbsii 
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.9 by this push:
 new 99166f1  Update copyright dates for 2020 releases
99166f1 is described below

commit 99166f164adf2f02df6c655264770387261e4988
Author: Christopher Tubbs 
AuthorDate: Sun Mar 8 10:11:05 2020 -0400

Update copyright dates for 2020 releases
---
 NOTICE   | 2 +-
 assemble/src/main/resources/NOTICE   | 2 +-
 docs/src/main/asciidoc/accumulo_user_manual.asciidoc | 2 +-
 server/native/src/main/resources/NOTICE  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/NOTICE b/NOTICE
index 3ff5fc7..3feb92e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Accumulo
-Copyright 2011-2018 The Apache Software Foundation
+Copyright 2011-2020 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/assemble/src/main/resources/NOTICE 
b/assemble/src/main/resources/NOTICE
index ad07100..b98c5f3 100644
--- a/assemble/src/main/resources/NOTICE
+++ b/assemble/src/main/resources/NOTICE
@@ -1,5 +1,5 @@
 Apache Accumulo
-Copyright 2011-2018 The Apache Software Foundation
+Copyright 2011-2020 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/docs/src/main/asciidoc/accumulo_user_manual.asciidoc 
b/docs/src/main/asciidoc/accumulo_user_manual.asciidoc
index d22f7a9..5145684 100644
--- a/docs/src/main/asciidoc/accumulo_user_manual.asciidoc
+++ b/docs/src/main/asciidoc/accumulo_user_manual.asciidoc
@@ -25,7 +25,7 @@ Apache Accumulo® User Manual Version 
${parsedVersion.majorVersion}.${parsedVers
 
 image::accumulo-logo.png[]
 
-Copyright © 2011-2018 The Apache Software Foundation, Licensed under the Apache
+Copyright © 2011-2020 The Apache Software Foundation, Licensed under the Apache
 License, Version 2.0.  Apache Accumulo, Accumulo, Apache, and the Apache
 Accumulo project logo are trademarks of the Apache Software Foundation.
 
diff --git a/server/native/src/main/resources/NOTICE 
b/server/native/src/main/resources/NOTICE
index f63b866..2d66381 100644
--- a/server/native/src/main/resources/NOTICE
+++ b/server/native/src/main/resources/NOTICE
@@ -1,5 +1,5 @@
 Apache Accumulo Native Libraries
-Copyright 2011-2018 The Apache Software Foundation
+Copyright 2011-2020 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).