From 2646e3c8630518b719d2e3c73c21ac4c8f768d42 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Tue, 2 Jun 2015 21:36:32 +0530
Subject: [PATCH 1/2] Remove bors cronjob

---
 bors.sls | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/bors.sls b/bors.sls
index 3452a4f4..b18599ec 100644
--- a/bors.sls
+++ b/bors.sls
@@ -11,9 +11,3 @@ https://github.com/servo/bors:
     - user: servo
     - group: servo
     - mode: 644
-
-cd /home/servo/bors && python bors.py:
-  cron.present:
-    - user: servo
-    - minute: '*/3'
-

From 2db118e4f0c72790cba6369375d890d5bf011ae8 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Tue, 2 Jun 2015 21:37:45 +0530
Subject: [PATCH 2/2] Remove all traces of bors

---
 bors.sls      | 13 -------------
 bors/bors.cfg | 14 --------------
 nginx/default |  4 ----
 top.sls       |  1 -
 4 files changed, 32 deletions(-)
 delete mode 100644 bors.sls
 delete mode 100644 bors/bors.cfg

diff --git a/bors.sls b/bors.sls
deleted file mode 100644
index b18599ec..00000000
--- a/bors.sls
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/servo/bors:
-  git.latest:
-    - rev: 4375dcc55c93fe611ea7d2bae40180274cfd978e
-    - target: /home/servo/bors
-    - user: servo
-
-/home/servo/bors/bors.cfg:
-  file.managed:
-    - source: salt://bors/bors.cfg
-    - template: jinja
-    - user: servo
-    - group: servo
-    - mode: 644
diff --git a/bors/bors.cfg b/bors/bors.cfg
deleted file mode 100644
index 3b102542..00000000
--- a/bors/bors.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-       "owner": "servo",
-       "repo": "servo",
-       "reviewers": ["glennw","jdm","kmcallister","larsbergstrom","Manishearth","metajack","mbrubeck","Ms2ger","pcwalton","SimonSapin","mrobinson","brunoabinader","saneyuki"],
-       "builders": ["linux1", "linux2", "android", "mac1", "mac2", "gonk"],
-       "master_ref": "master",
-       "test_ref": "auto",
-       "use_github_commit_status_api": false,
-       "max_pulls_per_run": 1,
-       "nbuilds": 7,
-       "buildbot": "http://build.servo.org",
-       "gh_user": "bors-servo",
-       "gh_pass": "{{ pillar["bors"]["gh-pass"] }}"
-}
diff --git a/nginx/default b/nginx/default
index e59d35cb..3d9ac364 100644
--- a/nginx/default
+++ b/nginx/default
@@ -2,10 +2,6 @@ server {
   listen 80 default_server;
   server_name build.servo.org;
   
-  location ~ /bors/.*\.(html|css|js)$ {
-    rewrite ^/bors/(.*)$ /$1 break;
-    root /home/servo/bors/;
-  }
 
   location / {
     proxy_pass http://localhost:8010/;
diff --git a/top.sls b/top.sls
index d27a5083..6b7dc21b 100644
--- a/top.sls
+++ b/top.sls
@@ -5,7 +5,6 @@ base:
 
   'servo-master':
     - buildbot-master
-    - bors
     - homu
     - nginx