Merge branch 'master' of http://github.com/btoddb/scale7-pelops into …

…btoddb-master Conflicts: pom.xml src/main/java/org/scale7/cassandra/pelops/Bytes.java src/main/java/org/scale7/cassandra/pelops/KeyspaceManager.java src/main/java/org/scale7/cassandra/pelops/Mutator.java src/main/java/org/scale7/cassandra/pelops/Selector.java Updated incorrect javadoc.
s7 · Oct 19, 2010 · 8c4bf9d · 8c4bf9d
1 parent e1ae806
commit 8c4bf9d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/scale7/cassandra/pelops/Bytes.java b/src/main/java/org/scale7/cassandra/pelops/Bytes.java
@@ -661,7 +661,7 @@ public static List<byte[]> transformBytesToList(Collection<Bytes> arrays) {
 
     /**
      * Transforms the provided list of {@link String} instances into a list of byte arrays.
-     * @param strings the list of Bytes instances
+     * @param strings the list of String instances
      * @return the list of byte arrays
      */
     public static Set<byte[]> transformUTF8ToSet(Collection<String> strings) {
@@ -677,7 +677,7 @@ public static Set<byte[]> transformUTF8ToSet(Collection<String> strings) {
 
     /**
      * Transforms the provided list of {@link String} instances into a list of byte arrays.
-     * @param strings the list of Bytes instances
+     * @param strings the list of String instances
      * @return the list of byte arrays
      */
     public static List<byte[]> transformUTF8ToList(Collection<String> strings) {