Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin'

This commit is contained in:
Andrew Phillips 2010-10-15 22:55:38 +02:00
parent 7a459aaf77 dfa5413671
commit 004cce88fd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/clojure/org/jclouds/core.clj
View File

@ -37,7 +37,8 @@
:ning 'org.jclouds.http.ning.config.NingHttpCommandExecutorServiceModule :ning 'org.jclouds.http.ning.config.NingHttpCommandExecutorServiceModule
:bouncycastle 'org.jclouds.encryption.bouncycastle.config.BouncyCastleCryptoModule :bouncycastle 'org.jclouds.encryption.bouncycastle.config.BouncyCastleCryptoModule
:joda 'org.jclouds.date.joda.config.JodaDateServiceModule :joda 'org.jclouds.date.joda.config.JodaDateServiceModule
:gae 'org.jclouds.gae.config.GoogleAppEngineConfigurationModule}) :gae 'org.jclouds.gae.config.GoogleAppEngineConfigurationModule
:gae-async 'org.jclouds.gae.config.AsyncGoogleAppEngineConfigurationModule})
(defn- instantiate [sym] (defn- instantiate [sym]
(let [loader (.getContextClassLoader (Thread/currentThread))] (let [loader (.getContextClassLoader (Thread/currentThread))]

2
rackspace/src/main/java/org/jclouds/rackspace/cloudservers/domain/ImageStatus.java
View File

@ -29,7 +29,7 @@ package org.jclouds.rackspace.cloudservers.domain;
*/ */
public enum ImageStatus { public enum ImageStatus {
UNRECOGNIZED, ACTIVE, SAVING, PREPARING, QUEUED, FAILED; UNRECOGNIZED, UNKNOWN, ACTIVE, SAVING, PREPARING, QUEUED, FAILED;
public String value() { public String value() {
return name(); return name();