[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

[vijay]

Updated Branches:
  refs/heads/trunk 2cecf05c4 -> f56f08c9e


Merge branch 'cassandra-1.2' into trunk

Conflicts:
        test/unit/org/apache/cassandra/db/HintedHandOffTest.java


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

Branch: refs/heads/trunk
Commit: f56f08c9eb306e3497d9dd70e46a9e289f7f7227
Parents: 2cecf05 60acf0d
Author: Vijay Parthasarathy <vijay2...@gmail.com>
Authored: Sun Feb 3 15:02:17 2013 -0800
Committer: Vijay Parthasarathy <vijay2...@gmail.com>
Committed: Sun Feb 3 15:02:17 2013 -0800

----------------------------------------------------------------------
 .../org/apache/cassandra/config/CFMetaData.java    |    5 +
 .../org/apache/cassandra/config/KSMetaData.java    |    1 +
 .../apache/cassandra/db/HintedHandOffManager.java  |    4 +
 src/java/org/apache/cassandra/db/SystemTable.java  |    8 +
 .../cassandra/metrics/HintedHandoffMetrics.java    |  108 +++++++++++++++
 .../org/apache/cassandra/service/StorageProxy.java |    6 +
 .../org/apache/cassandra/db/HintedHandOffTest.java |   20 +++
 7 files changed, 152 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56f08c9/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56f08c9/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56f08c9/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56f08c9/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/HintedHandOffTest.java
index 7fdfd3f,260f1c5..3356346
--- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
+++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java
@@@ -27,8 -29,12 +29,11 @@@ import java.util.concurrent.TimeUnit
  import org.junit.Test;
  
  import org.apache.cassandra.SchemaLoader;
+ import org.apache.cassandra.cql3.UntypedResultSet;
  import org.apache.cassandra.db.compaction.CompactionManager;
  import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy;
 -import org.apache.cassandra.db.filter.QueryPath;
+ import org.apache.cassandra.db.marshal.Int32Type;
+ import org.apache.cassandra.db.marshal.UUIDType;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;