Permalink
Browse files

README

  • Loading branch information...
vijaykiran committed Oct 21, 2011
1 parent 9a5b1ef commit c0023b8dd213f32d4c1c5fb15ee261fc394a3362
Showing with 28 additions and 0 deletions.
  1. +28 −0 README.txt
View
@@ -26,16 +26,32 @@ two abstractions at the moment: compute and blobstore. compute helps you
bootstrap machines in the cloud. blobstore helps you manage key-value
data.
+<<<<<<< HEAD
our current version is 1.1.0
our dev version is 1.2.0-SNAPSHOT
+=======
+our current version is 1.2.1
+our next maintenance version is 1.2.2-SNAPSHOT
+our dev version is 1.3.0-SNAPSHOT
+>>>>>>> 1e1d9ef0eb56054e6769335ea46572eb709cb1f0
our compute api supports: aws-ec2, gogrid, cloudservers-us, stub (in-memory), deltacloud,
cloudservers-uk, vcloud (generic), ec2 (generic), byon, nova,
+<<<<<<< HEAD
trmk-ecloud, trmk-vcloudexpress, eucalyptus (generic),
cloudsigma-zrh, elasticstack(generic), bluelock-vclouddirector,
slicehost, eucalyptus-partnercloud-ec2, elastichosts-lon-p (Peer 1),
elastichosts-sat-p (Peer 1), elastichosts-lon-b (BlueSquare),
openhosting-east1, serverlove-z1-man, skalicloud-sdg-my
+=======
+ trmk-ecloud, trmk-vcloudexpress, eucalyptus (generic)
+ cloudsigma-zrh, elasticstack(generic), go2cloud-jhb1, cloudsigma-lvs,
+ bluelock-vcloud-zone01, stratogen-vcloud-mycloud, rimuhosting,
+ slicehost, eucalyptus-partnercloud-ec2, elastichosts-lon-p (Peer 1),
+ elastichosts-sat-p (Peer 1), elastichosts-lon-b (BlueSquare),
+ openhosting-east1, serverlove-z1-man, skalicloud-sdg-my,
+ greenhousedata-element-vcloud, softlayer, cloudsigma (generic)
+>>>>>>> 1e1d9ef0eb56054e6769335ea46572eb709cb1f0
* note * the pom dependency org.jclouds/jclouds-allcompute gives you access to
to all of these providers
@@ -49,7 +65,19 @@ our blobstore api supports: aws-s3, cloudfiles-us, cloudfiles-uk, filesystem,
* note * the pom dependency org.jclouds/jclouds-allblobstore gives you access to
to all of these providers
+<<<<<<< HEAD
we also have support for: ibmdev, mezeo, nirvanix, boxdotnet, rimuhosting, openstack nova,
+=======
+our loadbalancer api supports: cloudloadbalancers-us
+
+ * note * the pom dependency org.jclouds/jclouds-allloadbalancer gives you access to
+ to all of these providers
+
+we also have aws-cloudwatch support.
+
+we also have support for: ibmdev, mezeo, nirvanix, boxdotnet, openstack nova, scality ring,
+ hosteurope-storage, tiscali-storage, scaleup-storage, googlestorage,
+>>>>>>> 1e1d9ef0eb56054e6769335ea46572eb709cb1f0
azurequeue, simpledb, cloudstack as well as a async-http-client
driver in the sandbox

0 comments on commit c0023b8

Please sign in to comment.