cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Date Fri, 10 Feb 2012 23:43:05 GMT
Updated Branches:
  refs/heads/cassandra-1.1 3eefbac13 -> 5f5e00bc9
  refs/heads/trunk ced22f76b -> 30ee8337e


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 30ee8337e8f89ef3baf7d7606ca9aeda2431c99f
Parents: ced22f7 5f5e00b
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Feb 10 17:42:47 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Feb 10 17:42:47 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 src/java/org/apache/cassandra/cli/CliClient.java   |    6 ------
 .../dht/AbstractByteOrderedPartitioner.java        |    4 ++++
 src/java/org/apache/cassandra/utils/Hex.java       |    3 ++-
 .../org/apache/cassandra/cli/CliHelp.yaml          |   14 ++++++++++++++
 test/unit/org/apache/cassandra/cli/CliTest.java    |    4 ++--
 test/unit/org/apache/cassandra/utils/HexTest.java  |    8 ++++----
 7 files changed, 27 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/30ee8337/src/resources/org/apache/cassandra/cli/CliHelp.yaml
----------------------------------------------------------------------


Mime
View raw message