[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[tylerhobbs]

Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
        src/java/org/apache/cassandra/cql3/Tuples.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea02b690
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea02b690
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea02b690

Branch: refs/heads/trunk
Commit: ea02b690019e0fe9c7326e30e8dc1d3de18373ce
Parents: 5767757 d92a79f
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed May 28 17:00:28 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed May 28 17:00:28 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cql3/Tuples.java | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea02b690/src/java/org/apache/cassandra/cql3/Tuples.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/Tuples.java
index 3aabbd3,818e3e6..384633d
--- a/src/java/org/apache/cassandra/cql3/Tuples.java
+++ b/src/java/org/apache/cassandra/cql3/Tuples.java
@@@ -305,12 -305,9 +305,9 @@@ public class Tuple
              super(bindIndex, receiver);
          }
  
 -        public Value bind(List<ByteBuffer> values) throws 
InvalidRequestException
 +        public Value bind(QueryOptions options) throws InvalidRequestException
          {
 -            ByteBuffer value = values.get(bindIndex);
 +            ByteBuffer value = options.getValues().get(bindIndex);
-             if (value == null)
-                 return null;
- 
              return value == null ? null : Value.fromSerialized(value, 
(TupleType)receiver.type);
          }
      }