History | View | Annotate | Download (4.3 kB)
Merge branch 'load_balancers-2' into experimental_2
Conflicts: .classpath AndroidManifest.xml res/layout/createserver.xml src/com/rackspace/cloud/files/api/client/CustomHttpClient.java src/com/rackspacecloud/android/AddServerActivity.java src/com/rackspacecloud/android/ListAccountsActivity.java
updated the addserverpage and general clean up
rebase
can now create multiple servers at once
add server layout