Skip to content

Commit

Permalink
Rebase 3
Browse files Browse the repository at this point in the history
A change

Edit

Re-based

Edits

Your mom

Automated Jenkins commit - Mon Nov 23 11:26:20 EST 2015

Automated Jenkins commit - Mon Nov 23 11:38:18 EST 2015

Rebased

Automated Jenkins commit - Mon Nov 23 11:51:38 EST 2015

Automated Jenkins commit - Mon Nov 23 11:53:39 EST 2015

Automated Jenkins commit - Mon Nov 23 14:31:24 EST 2015

Automated Jenkins commit - Mon Nov 23 14:42:25 EST 2015

Jerk

Automated Jenkins commit - Wed Nov 25 09:37:11 EST 2015

Automated Jenkins commit - Mon Nov 23 11:51:22 EST 2015

Automated Jenkins commit - Mon Nov 23 11:51:38 EST 2015

Automated Jenkins commit - Mon Nov 23 11:53:39 EST 2015

Automated Jenkins commit - Mon Nov 23 14:31:24 EST 2015

Automated Jenkins commit - Mon Nov 23 14:42:25 EST 2015

Jerk

Automated Jenkins commit - Wed Nov 25 09:37:11 EST 2015

Rebased

Automated Jenkins commit - Mon Nov 23 11:51:38 EST 2015

Automated Jenkins commit - Mon Nov 23 11:53:39 EST 2015

Automated Jenkins commit - Mon Nov 23 14:31:24 EST 2015

Automated Jenkins commit - Mon Nov 23 14:42:25 EST 2015

Jerk

Automated Jenkins commit - Wed Nov 25 09:37:11 EST 2015

Automated Jenkins commit - Mon Nov 23 11:51:22 EST 2015

Automated Jenkins commit - Mon Nov 23 11:51:38 EST 2015

Automated Jenkins commit - Mon Nov 23 11:53:39 EST 2015

Automated Jenkins commit - Mon Nov 23 14:31:24 EST 2015

Automated Jenkins commit - Mon Nov 23 14:42:25 EST 2015

Jerk

Automated Jenkins commit - Wed Nov 25 09:37:11 EST 2015
  • Loading branch information
jenkins authored and johnr-spindance committed Jan 6, 2016
1 parent b606c07 commit fb6e1f5
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 90 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ users/
.owner

#Secrets that we don't need
credentials.xml
identity.key.enc
tomcat.*
secret.key*
Expand Down
1 change: 1 addition & 0 deletions Test/Test.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Some crap
1 change: 1 addition & 0 deletions Test2/Test2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Test2
25 changes: 9 additions & 16 deletions config.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson>
<disabledAdministrativeMonitors/>
<version>1.0</version>
<numExecutors>2</numExecutors>
<mode>NORMAL</mode>
<useSecurity>true</useSecurity>
<authorizationStrategy class="hudson.security.GlobalMatrixAuthorizationStrategy">
<permission>hudson.model.Hudson.Administer:jenkins_chef</permission>
<permission>hudson.model.Hudson.Administer:johnr</permission>
</authorizationStrategy>
<securityRealm class="hudson.security.HudsonPrivateSecurityRealm">
<disableSignup>false</disableSignup>
<disabledAdministrativeMonitors/>
<version>2.0</version>
<permission>yourmom.model.Hudson.Administer:johnr</permission>
</authorizationStrategy>
<securityRealm class="hudson.security.HudsonPrivateSecurityRealm">
<disableSignup>false</disableSignup>
<enableCaptcha>false</enableCaptcha>
</securityRealm>
<disableRememberMe>false</disableRememberMe>
<projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
<workspaceDir>${ITEM_ROOTDIR}/workspace</workspaceDir>
<buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
<workspaceDir>${JERK_ROOTDIR}/workspace</workspaceDir>
<buildsDir>${JERK_ROOTDIR}/builds</buildsDir>
<markupFormatter class="hudson.markup.EscapedMarkupFormatter"/>
<jdks/>
<viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
<myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
<clouds/>
<scmCheckoutRetryCount>0</scmCheckoutRetryCount>
Expand All @@ -37,4 +30,4 @@
<label></label>
<nodeProperties/>
<globalNodeProperties/>
</hudson>
</hudson>
10 changes: 0 additions & 10 deletions hudson.plugins.git.GitTool.xml

This file was deleted.

1 change: 1 addition & 0 deletions john/john.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
john
23 changes: 0 additions & 23 deletions nodeMonitors.xml

This file was deleted.

1 change: 1 addition & 0 deletions test.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hello World!
41 changes: 0 additions & 41 deletions users/johnr/config.xml

This file was deleted.

0 comments on commit fb6e1f5

Please sign in to comment.