You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by si...@apache.org on 2012/06/07 17:24:59 UTC
svn commit: r1347677 - in /zookeeper/bookkeeper/tags/release-4.1.0: ./
CHANGES.txt NOTICE bookkeeper-server/src/main/resources/NOTICE.bin.txt
hedwig-server/src/main/resources/NOTICE.bin.txt
Author: sijie
Date: Thu Jun 7 15:24:59 2012
New Revision: 1347677
URL: http://svn.apache.org/viewvc?rev=1347677&view=rev
Log:
svn merge -c 1347629,1347636 https://svn.apache.org/repos/asf/zookeeper/bookkeeper/branches/branch-4.1
Modified:
zookeeper/bookkeeper/tags/release-4.1.0/ (props changed)
zookeeper/bookkeeper/tags/release-4.1.0/CHANGES.txt
zookeeper/bookkeeper/tags/release-4.1.0/NOTICE
zookeeper/bookkeeper/tags/release-4.1.0/bookkeeper-server/src/main/resources/NOTICE.bin.txt
zookeeper/bookkeeper/tags/release-4.1.0/hedwig-server/src/main/resources/NOTICE.bin.txt
Propchange: zookeeper/bookkeeper/tags/release-4.1.0/
------------------------------------------------------------------------------
Merged /zookeeper/bookkeeper/branches/branch-4.1:r1347629,1347636
Merged /zookeeper/bookkeeper/trunk:r1347634
Modified: zookeeper/bookkeeper/tags/release-4.1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/tags/release-4.1.0/CHANGES.txt?rev=1347677&r1=1347676&r2=1347677&view=diff
==============================================================================
--- zookeeper/bookkeeper/tags/release-4.1.0/CHANGES.txt (original)
+++ zookeeper/bookkeeper/tags/release-4.1.0/CHANGES.txt Thu Jun 7 15:24:59 2012
@@ -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 @@ Release 4.1.0 - 2012-05-31
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)
Modified: zookeeper/bookkeeper/tags/release-4.1.0/NOTICE
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/tags/release-4.1.0/NOTICE?rev=1347677&r1=1347676&r2=1347677&view=diff
==============================================================================
--- zookeeper/bookkeeper/tags/release-4.1.0/NOTICE (original)
+++ zookeeper/bookkeeper/tags/release-4.1.0/NOTICE Thu Jun 7 15:24:59 2012
@@ -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/).
Modified: zookeeper/bookkeeper/tags/release-4.1.0/bookkeeper-server/src/main/resources/NOTICE.bin.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/tags/release-4.1.0/bookkeeper-server/src/main/resources/NOTICE.bin.txt?rev=1347677&r1=1347676&r2=1347677&view=diff
==============================================================================
--- zookeeper/bookkeeper/tags/release-4.1.0/bookkeeper-server/src/main/resources/NOTICE.bin.txt (original)
+++ zookeeper/bookkeeper/tags/release-4.1.0/bookkeeper-server/src/main/resources/NOTICE.bin.txt Thu Jun 7 15:24:59 2012
@@ -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:
Modified: zookeeper/bookkeeper/tags/release-4.1.0/hedwig-server/src/main/resources/NOTICE.bin.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/tags/release-4.1.0/hedwig-server/src/main/resources/NOTICE.bin.txt?rev=1347677&r1=1347676&r2=1347677&view=diff
==============================================================================
--- zookeeper/bookkeeper/tags/release-4.1.0/hedwig-server/src/main/resources/NOTICE.bin.txt (original)
+++ zookeeper/bookkeeper/tags/release-4.1.0/hedwig-server/src/main/resources/NOTICE.bin.txt Thu Jun 7 15:24:59 2012
@@ -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: