[3/4] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

2013-05-10 Thread aleksey 
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
test/unit/org/apache/cassandra/service/CassandraServerTest.java


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

Branch: refs/heads/trunk
Commit: 26995337b8d65f7af8eb12ef3a2c946fc4ad41c1
Parents: c3ff774 ce8bc33
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat May 11 01:37:00 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat May 11 01:37:00 2013 +0300

--
 test/system/test_thrift_server.py  |   29 +
 .../cassandra/service/CassandraServerTest.java |   91 ---
 2 files changed, 29 insertions(+), 91 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/26995337/test/system/test_thrift_server.py
--

[3/4] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

2013-04-12 Thread dbrosius 
Merge branch 'cassandra-1.1' into cassandra-1.2


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

Branch: refs/heads/trunk
Commit: 95ff3bb5b6072b43cabc1e6c87e4a71daf406297
Parents: d7066f4 112014a
Author: Dave Brosius dbros...@apache.org
Authored: Sat Apr 13 00:10:14 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Sat Apr 13 00:10:14 2013 -0400

--
 .../db/compaction/LeveledCompactionStrategy.java   |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/95ff3bb5/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
--
diff --cc 
src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
index 9a73299,38a00f2..b6da891
--- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
@@@ -42,7 -47,8 +42,9 @@@ import org.apache.cassandra.notificatio
  public class LeveledCompactionStrategy extends AbstractCompactionStrategy 
implements INotificationConsumer
  {
  private static final Logger logger = 
LoggerFactory.getLogger(LeveledCompactionStrategy.class);
 +private static final String SSTABLE_SIZE_OPTION = sstable_size_in_mb;
+ 
+ private static final String SSTABLE_SIZE_OPTION = sstable_size_in_mb;
  
  @VisibleForTesting
  final LeveledManifest manifest;

[3/4] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

2013-03-13 Thread aleksey 
Merge branch 'cassandra-1.1' into cassandra-1.2


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

Branch: refs/heads/trunk
Commit: bb63238749171ebb4a6631f28c93246f3fd31743
Parents: 7cb8cf1 3346771
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Mar 14 01:58:16 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Mar 14 01:58:16 2013 +0300

--

--

[3/4] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

2013-02-12 Thread slebresne 
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
NEWS.txt
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/858dfefe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/858dfefe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/858dfefe

Branch: refs/heads/trunk
Commit: 858dfefe345be81caab038210c47750ad805b7d7
Parents: 4b1fca7 6849942
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Feb 12 14:01:30 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Feb 12 14:01:30 2013 +0100

--
 CHANGES.txt |3 +++
 build.xml   |2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/858dfefe/build.xml
--
diff --cc build.xml
index 772e8aa,6fa5172..421c8f3
--- a/build.xml
+++ b/build.xml
@@@ -25,7 -25,7 +25,7 @@@
  property name=debuglevel value=source,lines,vars/
  
  !-- default version and SCM information --
- property name=base.version value=1.2.1/
 -property name=base.version value=1.1.10/
++property name=base.version value=1.2.2/
  property name=scm.connection 
value=scm:git://git.apache.org/cassandra.git/
  property name=scm.developerConnection 
value=scm:git://git.apache.org/cassandra.git/
  property name=scm.url 
value=http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree/