prepping for release

basho · Jul 26, 2013 · cba050c · cba050c
1 parent 32a8f6c
commit cba050c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,21 @@
+1.4.1
+-----
+This is only a patch for a protocol buffers library issue. There are no
+changes to the client code.
+
+Google released Protocol Buffers 2.5.0 in Feb/2013. Unfortunately there
+are breaking changes that make protocol buffers generated by 2.4.1 
+incompatable. Users using 2.5.0 in their own code therefore run into problems.
+
+We have made the decision to shade 2.4.1 and our protocol buffers, including them
+inside the .jar file.
+We will be moving to v2.5.0 in the client v2.0   
+
+32a8f6c Brian Roach Merge pull request #269 from basho/shade_protobuf
+95380ea Dave Rusek Shade and rewrite packaging for com.google.protobuf:protobuf-java and com.basho.riak.protobuf:riak-pb to compensate for the fact that some users may have protobuf 2.5.0 in their classpath and that riak-pb is compiled wi
+beb577f Brian Roach [maven-release-plugin] prepare for next development iteration
+
+
 1.4.0
 -----
 This is a large feature release

diff --git a/THANKS b/THANKS
@@ -34,3 +34,4 @@ Matthew Shinn
 mbishop
 Guido Medina
 Sargun Dhillon
+Dave Rusek
diff --git a/pom.xml b/pom.xml
@@ -38,6 +38,10 @@
             <name>Brian Roach</name>
             <email>roach@basho.com</email>
         </developer>
+        <developer>
+            <name>Dave Rusek</name>
+            <email>drusek@basho.com</email>
+        </developer>
     </developers>
 
     <scm>