Updated Branches: refs/heads/cassandra-1.2 8d03008c2 -> b5f172624 refs/heads/trunk 191296c53 -> ba3430cb9
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba3430cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba3430cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba3430cb Branch: refs/heads/trunk Commit: ba3430cb969e1eb3a759bffa4ee501b64fc89573 Parents: 191296c b5f1726 Author: Yuki Morishita <yu...@apache.org> Authored: Mon Mar 11 16:22:51 2013 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Mon Mar 11 16:22:51 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba3430cb/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba3430cb/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
