cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 25 Apr 2014 10:22:50 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: f1075586efc49d019028ea4310c2c5b58cf4111b
Parents: 3d03b9b 8cb81f7
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Apr 25 12:22:42 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Apr 25 12:22:42 2014 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/config/CFMetaData.java      |  2 +-
 src/java/org/apache/cassandra/cql3/ColumnIdentifier.java  | 10 +---------
 .../apache/cassandra/db/composites/AbstractComposite.java |  4 ++--
 .../org/apache/cassandra/db/composites/Composite.java     |  2 +-
 .../org/apache/cassandra/db/composites/Composites.java    |  2 +-
 .../org/apache/cassandra/db/filter/IDiskAtomFilter.java   |  3 ++-
 .../org/apache/cassandra/db/filter/NamesQueryFilter.java  |  5 +++--
 .../org/apache/cassandra/db/filter/SliceQueryFilter.java  |  4 ++--
 8 files changed, 13 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1075586/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1075586/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java
----------------------------------------------------------------------


Mime
View raw message