cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 09 Sep 2014 23:41:11 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java


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

Branch: refs/heads/trunk
Commit: 25272a4732e75f142fb521b46eb394606d0483aa
Parents: c200851 3ba392f
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Sep 9 16:41:00 2014 -0700
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Sep 9 16:41:00 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/hadoop/cql3/CqlConfigHelper.java  | 25 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25272a47/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/25272a47/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------


Mime
View raw message