You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2012/11/15 07:27:02 UTC

[1/2] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1

Updated Branches:
  refs/heads/cassandra-1.1 8d6e43f34 -> caeee7c68


Merge branch 'cassandra-1.0' into cassandra-1.1


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

Branch: refs/heads/cassandra-1.1
Commit: caeee7c68383df5597002944b32731f1104c5105
Parents: 8d6e43f 08eebcd
Author: Dave Brosius <db...@apache.org>
Authored: Thu Nov 15 01:26:00 2012 -0500
Committer: Dave Brosius <db...@apache.org>
Committed: Thu Nov 15 01:26:00 2012 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/cli/CliHelp.yaml          |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


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