Author: adriancole
Date: Sat Jul 28 18:53:12 2012
New Revision: 1366739
URL: http://svn.apache.org/viewvc?rev=1366739&view=rev
Log:
WHIRR-605 Upgrade Cassandra to 1.1.2
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/core/src/main/java/org/apache/whirr/service/BlobStoreContextBuilder.java
whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java
whirr/trunk/recipes/cassandra.properties
whirr/trunk/services/cassandra/pom.xml
whirr/trunk/services/cassandra/src/main/resources/functions/install_cassandra.sh
Modified: whirr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1366739&r1=1366738&r2=1366739&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Sat Jul 28 18:53:12 2012
@@ -97,6 +97,8 @@ Trunk (unreleased changes)
WHIRR-428. Always match a stable Canonical AMI on AWS EC2.
(Andrew Bayer via tomwhite)
+ WHIRR-605. Upgrade Cassandra to 1.1.2. (Eldon Stegall via adriancole)
+
BUG FIXES
WHIRR-582. Yarn service does not build in IntelliJ because of missing
Hadoop test dependencies (Frank Scholten)
Modified:
whirr/trunk/core/src/main/java/org/apache/whirr/service/BlobStoreContextBuilder.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/service/BlobStoreContextBuilder.java?rev=1366739&r1=1366738&r2=1366739&view=diff
==============================================================================
---
whirr/trunk/core/src/main/java/org/apache/whirr/service/BlobStoreContextBuilder.java
(original)
+++
whirr/trunk/core/src/main/java/org/apache/whirr/service/BlobStoreContextBuilder.java
Sat Jul 28 18:53:12 2012
@@ -163,7 +163,7 @@ public class BlobStoreContextBuilder {
@Override
@Deprecated
public <S, A> RestContext<S, A> getProviderSpecificContext() {
- return delegate().getProviderSpecificContext();
+ return delegate().<S, A>getProviderSpecificContext();
}
@Override
@@ -188,17 +188,17 @@ public class BlobStoreContextBuilder {
@Override
public <C extends Context> C unwrap(TypeToken<C> type) {
- return delegate().unwrap(type);
+ return delegate().<C>unwrap(type);
}
@Override
public <C extends Context> C unwrap(Class<C> clazz) {
- return delegate().unwrap(clazz);
+ return delegate().<C>unwrap(clazz);
}
@Override
public <C extends Context> C unwrap() {
- return delegate().unwrap();
+ return delegate().<C>unwrap();
}
}
Modified:
whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java?rev=1366739&r1=1366738&r2=1366739&view=diff
==============================================================================
--- whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java
(original)
+++ whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java
Sat Jul 28 18:53:12 2012
@@ -165,7 +165,7 @@ public enum ComputeCache implements Func
@Override
@Deprecated
public <S, A> RestContext<S, A> getProviderSpecificContext() {
- return delegate().getProviderSpecificContext();
+ return delegate().<S, A>getProviderSpecificContext();
}
@Override
@@ -202,17 +202,17 @@ public enum ComputeCache implements Func
@Override
public <C extends Context> C unwrap(TypeToken<C> type) {
- return delegate().unwrap(type);
+ return delegate().<C>unwrap(type);
}
@Override
public <C extends Context> C unwrap(Class<C> clazz) {
- return delegate().unwrap(clazz);
+ return delegate().<C>unwrap(clazz);
}
@Override
public <C extends Context> C unwrap() {
- return delegate().unwrap();
+ return delegate().<C>unwrap();
}
}
Modified: whirr/trunk/recipes/cassandra.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/recipes/cassandra.properties?rev=1366739&r1=1366738&r2=1366739&view=diff
==============================================================================
--- whirr/trunk/recipes/cassandra.properties (original)
+++ whirr/trunk/recipes/cassandra.properties Sat Jul 28 18:53:12 2012
@@ -39,5 +39,5 @@ whirr.instance-templates=3 cassandra
# whirr.public-key-file=${whirr.private-key-file}.pub
# Expert: specify the version of Cassandra to install.
-#whirr.cassandra.version.major=1.0.8
-#whirr.cassandra.tarball.url=http://www.apache.org/dist/cassandra/1.0.8/apache-cassandra-1.0.8-bin.tar.gz
+#whirr.cassandra.version.major=1.1.2
+#whirr.cassandra.tarball.url=http://www.apache.org/dist/cassandra/1.1.2/apache-cassandra-1.1.2-bin.tar.gz
Modified: whirr/trunk/services/cassandra/pom.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cassandra/pom.xml?rev=1366739&r1=1366738&r2=1366739&view=diff
==============================================================================
--- whirr/trunk/services/cassandra/pom.xml (original)
+++ whirr/trunk/services/cassandra/pom.xml Sat Jul 28 18:53:12 2012
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
- <version>1.0.8</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
<groupId>org.apache.cassandra.deps</groupId>
Modified:
whirr/trunk/services/cassandra/src/main/resources/functions/install_cassandra.sh
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/cassandra/src/main/resources/functions/install_cassandra.sh?rev=1366739&r1=1366738&r2=1366739&view=diff
==============================================================================
---
whirr/trunk/services/cassandra/src/main/resources/functions/install_cassandra.sh
(original)
+++
whirr/trunk/services/cassandra/src/main/resources/functions/install_cassandra.sh
Sat Jul 28 18:53:12 2012
@@ -16,8 +16,8 @@
#
function install_cassandra() {
- C_MAJOR_VERSION=${1:-1.0}
-
C_TAR_URL=${2:-http://archive.apache.org/dist/cassandra/1.0.8/apache-cassandra-1.0.8-bin.tar.gz}
+ C_MAJOR_VERSION=${1:-1.1}
+
C_TAR_URL=${2:-http://apache.osuosl.org/cassandra/1.1.2/apache-cassandra-1.1.2-bin.tar.gz}
c_tar_file=`basename $C_TAR_URL`
c_tar_dir=`echo $c_tar_file | awk -F '-bin' '{print $1}'`
