You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/11/11 18:43:44 UTC

[1/6] git commit: typo

Updated Branches:
  refs/heads/cassandra-1.2 310276555 -> 85b657494
  refs/heads/cassandra-2.0 3af19c4dd -> 2d1085dde
  refs/heads/trunk e9c595b5e -> 16cf7f3e8


typo


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

Branch: refs/heads/cassandra-1.2
Commit: 85b6574943c0b2a9ba1626e4deed55a550ec3120
Parents: 3102765
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Nov 11 11:43:32 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Nov 11 11:43:32 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/85b65749/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0532a45..bc0d65b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,7 +12,7 @@
  * make calculatePendingRanges asynchronous (CASSANDRA-6244)
  * Remove blocking flushes in gossip thread (CASSANDRA-6297)
  * Fix potential socket leak in connectionpool creation (CASSANDRA-6308)
- * Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleSrrategy (CASSANDRA-6238)
+ * Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleStrategy (CASSANDRA-6238)
  * cqlsh: handle 'null' as session duration (CASSANDRA-6317)

[2/6] git commit: typo

Posted by jb...@apache.org.
typo


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

Branch: refs/heads/cassandra-2.0
Commit: 85b6574943c0b2a9ba1626e4deed55a550ec3120
Parents: 3102765
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Nov 11 11:43:32 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Nov 11 11:43:32 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/85b65749/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0532a45..bc0d65b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,7 +12,7 @@
  * make calculatePendingRanges asynchronous (CASSANDRA-6244)
  * Remove blocking flushes in gossip thread (CASSANDRA-6297)
  * Fix potential socket leak in connectionpool creation (CASSANDRA-6308)
- * Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleSrrategy (CASSANDRA-6238)
+ * Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleStrategy (CASSANDRA-6238)
  * cqlsh: handle 'null' as session duration (CASSANDRA-6317)

[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/cassandra-2.0
Commit: 2d1085dde65e94dece6ec131de6da9f501edd125
Parents: 3af19c4 85b6574
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Nov 11 11:43:38 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Nov 11 11:43:38 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


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

[3/6] git commit: typo

Posted by jb...@apache.org.
typo


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

Branch: refs/heads/trunk
Commit: 85b6574943c0b2a9ba1626e4deed55a550ec3120
Parents: 3102765
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Nov 11 11:43:32 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Nov 11 11:43:32 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/85b65749/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0532a45..bc0d65b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,7 +12,7 @@
  * make calculatePendingRanges asynchronous (CASSANDRA-6244)
  * Remove blocking flushes in gossip thread (CASSANDRA-6297)
  * Fix potential socket leak in connectionpool creation (CASSANDRA-6308)
- * Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleSrrategy (CASSANDRA-6238)
+ * Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleStrategy (CASSANDRA-6238)
  * cqlsh: handle 'null' as session duration (CASSANDRA-6317)

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 16cf7f3e876674bdd398ad09b9d1a801f432c03d
Parents: e9c595b 2d1085d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Nov 11 11:43:43 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Nov 11 11:43:43 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


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

[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: 2d1085dde65e94dece6ec131de6da9f501edd125
Parents: 3af19c4 85b6574
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Nov 11 11:43:38 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Nov 11 11:43:38 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


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