You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/12/05 21:51:01 UTC

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

Updated Branches:
  refs/heads/cassandra-1.2 52a650ea7 -> 5c9572e75
  refs/heads/cassandra-1.2.0 2f3b5bfb2 -> a41b7806a
  refs/heads/trunk 7ec4f5a6e -> 515069acc


Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/config/Config.java
	src/java/org/apache/cassandra/service/StorageProxy.java


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

Branch: refs/heads/trunk
Commit: 515069accbb6683f5fbda8f754298f5b77df0028
Parents: 7ec4f5a 5c9572e
Author: Brandon Williams <br...@apache.org>
Authored: Wed Dec 5 14:50:55 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Dec 5 14:50:55 2012 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------