cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Date Tue, 05 Aug 2014 08:22:46 GMT
Merge branch 'cassandra-2.1.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: e6602f76391d13b5966b75e7751a58a8382fa375
Parents: 1c1a40e 95d289b
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Aug 5 10:22:07 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Aug 5 10:22:07 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 build.xml                                                    | 2 +-
 .../org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java    | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6602f76/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index d812555,f1014fb..5271869
--- a/build.xml
+++ b/build.xml
@@@ -399,9 -400,8 +399,9 @@@
            <dependency groupId="io.netty" artifactId="netty-all" version="4.0.20.Final"
/>
            <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2"
/>
            <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2"
/>
-           <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
version="2.0.1" />
+           <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
version="2.0.4" />
            <dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0"
/>
 +	  <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations"
version="1.2.0" />
          </dependencyManagement>
          <developer id="alakshman" name="Avinash Lakshman"/>
          <developer id="antelder" name="Anthony Elder"/>

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


Mime
View raw message