From: Andrew Schoen <andrew.schoen@gmail.com>
Date: Fri, 7 Nov 2014 17:49:12 +0000 (-0600)
Subject: change name so it doesn't conflict with existing job; remove commented out branches
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a6106c77bfc82d27b2d08b9a24e3597b68484336;p=ceph-build.git

change name so it doesn't conflict with existing job; remove commented out branches
---

diff --git a/ceph-deploy/config/definitions/ceph-deploy.yml b/ceph-deploy/config/definitions/ceph-deploy.yml
index d578d876..20a3c94a 100644
--- a/ceph-deploy/config/definitions/ceph-deploy.yml
+++ b/ceph-deploy/config/definitions/ceph-deploy.yml
@@ -1,19 +1,16 @@
 - job:
-    name: ceph-deploy 
+    name: ceph-deploy2
     node: gitbuilder-cdep-deb-cloud-precise-amd64-basic
     project-type: matrix
     defaults: global
     disabled: false
-    display-name: 'Ceph Deploy' 
+    display-name: 'Ceph Deploy 2'
     concurrent: true
     quiet-period: 5
     block-downstream: false
     block-upstream: false
     retry-count: 3
 
-    triggers:
-      - pollscm: "H * * * *"
-
     parameters:
       - string:
           name: BRANCH
@@ -27,10 +24,6 @@
       - git:
           url: https://github.com/ceph/ceph-deploy.git
           branches:
-            #- master
-            #- firefly
-            #- giant
-            #- next
             - $BRANCH
           browser: githubweb
           browser-url: http://github.com/ceph/ceph-deploy.git