cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [07/11] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Fri, 31 Jan 2014 14:12:50 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	.rat-excludes
	build.xml
	debian/changelog


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

Branch: refs/heads/trunk
Commit: 9d70cf3b90e703865b4015bb19d171349953d5c7
Parents: 1141cdb 4cb045a
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Jan 31 13:25:45 2014 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Jan 31 13:25:45 2014 +0100

----------------------------------------------------------------------
 .rat-excludes                                      |  2 +-
 doc/cql3/CQL.textile                               | 10 +++++-----
 .../apache/cassandra/db/BatchlogManagerTest.java   | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d70cf3b/.rat-excludes
----------------------------------------------------------------------
diff --cc .rat-excludes
index cf618c0,112aec0..871f5df
--- a/.rat-excludes
+++ b/.rat-excludes
@@@ -20,12 -18,18 +20,12 @@@ lib/licenses/*.tx
  .externalToolBuilders/**
  test/data/serialization/*/*
  **/*.wpr
 -conf/schema-sample.txt
 -drivers/txpy/txcql/cassandra/*
 -drivers/py/cql/cassandra/*
  doc/**
  build.properties.default
 -test/data/legacy-sstables/**
 +test/data/**
  examples/pig/**
 +examples/triggers/build.xml
 +examples/triggers/conf/*
  examples/hadoop_word_count/conf/log4j.properties
  pylib/cqlshlib/test/**
- src/resources/org/apache/cassandra/config/version.properties
+ src/resources/org/apache/cassandra/config/version.properties

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d70cf3b/doc/cql3/CQL.textile
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d70cf3b/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
----------------------------------------------------------------------


Mime
View raw message