cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 30 Apr 2014 00:24:59 GMT
Merge branch 'cassandra-2.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/bcd14110
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcd14110
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcd14110

Branch: refs/heads/cassandra-2.1
Commit: bcd14110bcf2ae9b1fbe4b3307eca154fa654614
Parents: 04884eb 90d086a
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Tue Apr 29 20:24:00 2014 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Tue Apr 29 20:24:00 2014 -0400

----------------------------------------------------------------------
 CHANGES.txt                                        | 1 +
 src/java/org/apache/cassandra/tracing/Tracing.java | 7 +++++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd14110/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 73e39cc,428f8fc..b60feb8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -111,14 -80,7 +111,15 @@@ Merged from 2.0
     (CASSANDRA-6906)
   * Fix SSTable not released if stream session fails (CASSANDRA-6818)
   * Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
 + * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
 + * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 + * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058)
 + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 + * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
++ * Re-add parameter columns to tracing session (CASSANDRA-6942)
  Merged from 1.2:
 + * Fix nodetool display with vnodes (CASSANDRA-7082)
   * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
   * add extra SSL cipher suites (CASSANDRA-6613)
   * fix nodetool getsstables for blob PK (CASSANDRA-6803)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd14110/src/java/org/apache/cassandra/tracing/Tracing.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tracing/Tracing.java
index 6c68b29,88239be..31cc1ab
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@@ -203,12 -206,13 +203,19 @@@ public class Tracin
              public void run()
              {
                  CFMetaData cfMeta = CFMetaData.TraceSessionsCf;
 -                ColumnFamily cf = TreeMapBackedSortedColumns.factory.create(cfMeta);
 -                addColumn(cf, buildName(cfMeta, bytes("coordinator")), FBUtilities.getBroadcastAddress());
 +                ColumnFamily cf = ArrayBackedSortedColumns.factory.create(cfMeta);
 +                addColumn(cf, buildName(cfMeta, "coordinator"), FBUtilities.getBroadcastAddress());
                  addParameterColumns(cf, parameters);
++<<<<<<< HEAD
 +                addColumn(cf, buildName(cfMeta, "request"), request);
 +                addColumn(cf, buildName(cfMeta, "started_at"), started_at);
 +                mutateWithCatch(new Mutation(TRACE_KS, sessionIdBytes, cf));
++=======
+                 addColumn(cf, buildName(cfMeta, bytes("request")), request);
+                 addColumn(cf, buildName(cfMeta, bytes("started_at")), started_at);
+                 addParameterColumns(cf, parameters);
+                 mutateWithCatch(new RowMutation(TRACE_KS, sessionIdBytes, cf));
++>>>>>>> cassandra-2.0
              }
          });
      }


Mime
View raw message