From 5c1303c7d80a81f2dd6614c48c9a2ecb005b6aed Mon Sep 17 00:00:00 2001
From: Brian Parry <brian.parry@emc.com>
Date: Mon, 10 Oct 2016 10:39:51 -0400
Subject: [PATCH] Revert "Travis changes to deploy API docs to bintray"

---
 .bintray-doc.json                  | 19 -------------------
 .bintray-deb.json => .bintray.json |  0
 .travis.yml                        | 21 +++++++--------------
 extra/make-docs.sh                 |  1 -
 4 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 .bintray-doc.json
 rename .bintray-deb.json => .bintray.json (100%)

diff --git a/.bintray-doc.json b/.bintray-doc.json
deleted file mode 100644
index 58ebbcfc1..000000000
--- a/.bintray-doc.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "package": {
-        "name": "apidoc",
-        "repo": "docs",
-        "subject": "rackhd"
-    },
-
-    "version": {
-        "name": "master"
-    },
-
-    "files":
-    [
-        {
-            "includePattern": "build/(.+\.pdf)", "uploadPattern": "$1",
-        }
-    ],
-    "publish": true
-}
diff --git a/.bintray-deb.json b/.bintray.json
similarity index 100%
rename from .bintray-deb.json
rename to .bintray.json
diff --git a/.travis.yml b/.travis.yml
index 7b372dcd0..975019cde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,20 +30,13 @@ before_deploy:
  - ./extra/make-deb.sh
 
 deploy:
- -  provider: bintray
-    file: .bintray-deb.json
-    user: $BINTRAY_USER
-    key: $BINTRAY_KEY
-    on:
-      branch: master
-      node: "4"
- -  provider: bintray
-    file: .bintray-doc.json
-    user: $BINTRAY_USER
-    key: $BINTRAY_KEY
-    on:
-      branch: master
-      node: "4"
+  provider: bintray
+  file: .bintray.json
+  user: $BINTRAY_USER
+  key: $BINTRAY_KEY
+  on:
+    branch: master
+    node: "4"
 
 notifications:
   slack:
diff --git a/extra/make-docs.sh b/extra/make-docs.sh
index 6a6ce693e..040e19471 100755
--- a/extra/make-docs.sh
+++ b/extra/make-docs.sh
@@ -6,4 +6,3 @@ cd $SCRIPT_DIR/..
 
 npm run apidoc
 npm run taskdoc
-npm run swaggerdoc