Auto merge of #3284 - alexcrichton:fix-uploads, r=alexcrichton

bors · web-flow · commit f6500c6b6480 · 2016-11-11T07:28:07.000-08:00
Publish builds from the auto-cargo branch

Cargo doesn't use auto, it uses auto-cargo
diff --git a/.travis.yml b/.travis.yml
@@ -144,7 +144,7 @@ deploy:
     secret_access_key:
       secure: wKKDMYBVTdWLuc7+ffpjTqJs1EdM2pXpV6keUfZGv9RLRta+esh/r/cgc+UQ7+m9JHAliH8eWhlMm5ws6WDgkTvM0PTdqWBgwd24BRbAitsXX2kWfi9WgAeSJVSkIJdZ999TRpRIJu7Zc+1++fbfdD/tDv5XBirQGOJv1HynVWY=
     on:
-      branch: auto
+      branch: auto-cargo
       condition: $DEPLOY = 1
 
 cache:
diff --git a/appveyor.yml b/appveyor.yml
@@ -68,4 +68,4 @@ deploy:
     artifact: cargo
     folder: cargo-master
     on:
-      branch: auto
+      branch: auto-cargo
