Prepared release 1.1.2

up1 · Oct 31, 2012 · 84eda3a · 84eda3a
1 parent ba8c6fb
commit 84eda3a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/build.properties b/build.properties
@@ -39,5 +39,6 @@ tomcat.manager.password=tomcat
 tomcat.context=/voldemort
 
 ## Release
-curr.release=1.1.1
+curr.release=1.1.2
+
 
diff --git a/release_notes.txt b/release_notes.txt
@@ -1,6 +1,13 @@
+Release 1.1.2 on 10/31/2012
+
+Changes made since release 1.1.1
+* Reverted a change to voldemort.versioning.Versioned.getVersion() so
+  that a Version is returned as our clients expect.
+
+
 Release 1.1.1 on 10/30/2012
 
-Changed made since release 1.1.0
+Changes made since release 1.1.0
 * Fixed connection leak in ClientRequestExecutorFactory
 * Changed client to default to DefaultStoreClient
 

diff --git a/src/java/voldemort/versioning/Versioned.java b/src/java/voldemort/versioning/Versioned.java
@@ -44,7 +44,6 @@ public Versioned(T object, Version version) {
         this.object = object;
     }
 
-    // public VectorClock getVersion() {
     public Version getVersion() {
         return version;
     }