http://git-wip-us.apache.org/repos/asf/cassandra/blob/88d2ac4f/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
--
diff --cc src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index b4211bb,000..31
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9dd805d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dd805d0
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/405a828c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/405a828c
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/82d1600d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82d1600d
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47b50b45
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47b50b45
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc1cbdeb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc1cbdeb
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cded2764
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cded2764
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/20dd606e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20dd606e
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4a53f4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4a53f4d
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3483418b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3483418b
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8303fd1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8303fd1f
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/431ecdb6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/431ecdb6
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/407dc30e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/407dc30e
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
* cassandra-2.2:
Allow nodetool info to run with readonly JMX access
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d7eb187
Tree: http://git-wip-us.apache.org/repos/
Merge branch 'cassandra-2.2' into cassandra-3.0
* cassandra-2.2:
Fix CompressorTest on non-x86 environment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d354ddcf
Tree: http://git-wip-us.apache.org/repos/asf/cassan
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6572234
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6572234
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a0e97df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a0e97df
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dbc40b1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dbc40b1e
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c59897b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c59897b6
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a5d0a1e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a5d0a1e
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/943e732c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/943e732c
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bfe09f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bfe09f4
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/caae9870
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/caae9870
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c568efee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c568efee
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f4b5e30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f4b5e30
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4238cdd9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4238cdd9
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0cd3261
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0cd3261
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04a75a63
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04a75a63
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f52f299c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f52f299c
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/db10cb25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db10cb25
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63285908
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63285908
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7cb6f61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7cb6f61
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b0f2266b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0f2266b
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65033350
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65033350
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b5df24f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b5df24f
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4354fb27
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4354fb27
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15ac9e89
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15ac9e89
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5dbab320
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5dbab320
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fcc40e58
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcc40e58
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efbcd15d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efbcd15d
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1aa97e30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1aa97e30
Diff: http://git-wip-us.apache.org/repos/asf/c
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23f62962
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23f62962
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67fd42fd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67fd42fd
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e095833
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e095833
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1deb0443
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1deb0443
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74070ee4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74070ee4
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e64a9d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e64a9d0
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97dc8d52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97dc8d52
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39bc5de6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39bc5de6
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf0c61b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf0c61b8
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f5e9602
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f5e9602
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/454268bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/454268bc
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b324759e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b324759e
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90661a32
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90661a32
Diff: http://git-wip-us.apache.org/repos/asf/c
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d94dc2b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d94dc2b
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d4e0cd2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d4e0cd2
Diff: http://git-wip-us.apache.org/repos/asf/c
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83248186
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83248186
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34bbb445
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34bbb445
Diff: http:/
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3818d30b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3818d30b
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/796b0f26
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/796b0f26
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44e19947
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44e19947
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3bc585d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bc585d5
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9cc48906
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9cc48906
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f545a702
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f545a702
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29d3d44d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29d3d44d
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2923011b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2923011b
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
test/unit/org/apache/cassandra/db/CommitLogTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da8d48a7
Tree: http://git-wip-us.apache.org/repos
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b7caa13
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b7caa13
Diff: http://git-wip-us.apache.org/repos/asf
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java
src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Com
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a94c7a3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a94c7a3
Diff: http://git-wip-us.apache.org/repos/asf
70 matches
Mail list logo