Skip to content

Commit

Permalink
Merge pull request kubernetes#5857 from brendandburns/cassandra
Browse files Browse the repository at this point in the history
Update the cassandra example to pick up recent changes.
  • Loading branch information
roberthbailey committed Mar 24, 2015
2 parents 10e2e9a + ab0ae0a commit 13429ce
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 4 deletions.
4 changes: 2 additions & 2 deletions examples/cassandra/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ desiredState:
id: cassandra
containers:
- name: cassandra
image: kubernetes/cassandra
image: kubernetes/cassandra:v2
command:
- /run.sh
cpu: 1000
Expand Down Expand Up @@ -121,7 +121,7 @@ desiredState:
id: cassandra
containers:
- name: cassandra
image: kubernetes/cassandra
image: kubernetes/cassandra:v2
command:
- /run.sh
cpu: 1000
Expand Down
2 changes: 1 addition & 1 deletion examples/cassandra/cassandra-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ desiredState:
id: cassandra
containers:
- name: cassandra
image: kubernetes/cassandra:v1
image: kubernetes/cassandra:v2
command:
- /run.sh
cpu: 1000
Expand Down
2 changes: 1 addition & 1 deletion examples/cassandra/cassandra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ desiredState:
id: cassandra
containers:
- name: cassandra
image: kubernetes/cassandra:v1
image: kubernetes/cassandra:v2
command:
- /run.sh
cpu: 1000
Expand Down
Binary file modified examples/cassandra/image/kubernetes-cassandra.jar
Binary file not shown.
37 changes: 37 additions & 0 deletions examples/cassandra/java/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>io.k8s.cassandra</groupId>
<artifactId>kubernetes-cassandra</artifactId>
<version>0.0.2</version>
<build>
<sourceDirectory>src</sourceDirectory>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.6.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.6.3</version>
</dependency>
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
<version>2.0.11</version>
</dependency>
</dependencies>
</project>

0 comments on commit 13429ce

Please sign in to comment.