cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject [2/2] git commit: merge from 1.2
Date Wed, 20 Mar 2013 21:41:41 GMT
merge from 1.2


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

Branch: refs/heads/trunk
Commit: 86c3afb6d74c4540545596b3ec49b02e6b7fc766
Parents: 3554391 3f88b27
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Wed Mar 20 14:41:30 2013 -0700
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Wed Mar 20 14:41:30 2013 -0700

----------------------------------------------------------------------
 CHANGES.txt |    1 +
 build.xml   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/86c3afb6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3309ab9,1d17e08..f04be52
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -23,9 -3,9 +23,10 @@@
   * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
   * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
   * Improve asynchronous hint delivery (CASSANDRA-5179)
+  * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
  
  
 +
  1.2.3
   * add check for sstable overlap within a level on startup (CASSANDRA-5327)
   * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/86c3afb6/build.xml
----------------------------------------------------------------------


Mime
View raw message