svn merge -c 1347629,1347636 https://svn.apache.org/repos/asf/zookeeper/bookkeeper/branches/branch-4.1
git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/tags/release-4.1.0@1347677 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 95f6925..8de8dab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-Release 4.1.0 - 2012-05-31
+Release 4.1.0 - 2012-06-07
Non-backward compatible changes:
@@ -128,6 +128,8 @@
BOOKKEEPER-287: NoSuchElementException in LedgerCacheImpl (sijie)
+ BOOKKEEPER-288: NOTICE files don't have the correct year (ivank via sijie)
+
hedwig-client/
BOOKKEEPER-217: NPE in hedwig client when enable DEBUG (sijie via ivank)
diff --git a/NOTICE b/NOTICE
index 11d5ea8..ba13c03 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache BookKeeper
-Copyright 2011 The Apache Software Foundation
+Copyright 2011-2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/bookkeeper-server/src/main/resources/NOTICE.bin.txt b/bookkeeper-server/src/main/resources/NOTICE.bin.txt
index 29c1926..b55e16f 100644
--- a/bookkeeper-server/src/main/resources/NOTICE.bin.txt
+++ b/bookkeeper-server/src/main/resources/NOTICE.bin.txt
@@ -1,3 +1,6 @@
+Apache BookKeeper
+Copyright 2011-2012 The Apache Software Foundation
+
Licensed 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:
diff --git a/hedwig-server/src/main/resources/NOTICE.bin.txt b/hedwig-server/src/main/resources/NOTICE.bin.txt
index a0122b5..e9d967e 100644
--- a/hedwig-server/src/main/resources/NOTICE.bin.txt
+++ b/hedwig-server/src/main/resources/NOTICE.bin.txt
@@ -1,3 +1,6 @@
+Apache BookKeeper
+Copyright 2011-2012 The Apache Software Foundation
+
Licensed 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:
