From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Thu, 13 Nov 2014 16:13:16 +0000 (-0800)
Subject: Merge branch 'master' of /opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=c40280e83673e941f832d05e6aba582045115062;hp=76ff60f633a11efb4e6685c94bb723957159ac0d;p=clearscm.git

Merge branch 'master' of /opt/git/clearscm
---

diff --git a/web/Resumes/Andrew/Resume.doc b/web/Resumes/Andrew/Resume.doc
index 599c067..e1f070e 100644
Binary files a/web/Resumes/Andrew/Resume.doc and b/web/Resumes/Andrew/Resume.doc differ
diff --git a/web/Resumes/Andrew/index.php b/web/Resumes/Andrew/index.php
index 33456f6..c4868b8 100644
--- a/web/Resumes/Andrew/index.php
+++ b/web/Resumes/Andrew/index.php
@@ -177,11 +177,14 @@ function stoptimer () {
   <font class=dim>Contract</font><br>
   <a href="http://defaria.com/blogs/Status/archives/cat_audience.html">Workblog</a></p>
 
-  <p>Worked as a Linux Admin, Perforce Admin maintaining an inhouse developed build system
-  that utilizes Perl/PHP/Apache/Linux/Windows servers to allow engineers in the field to
-  perform customized builds around the world. Helped set up and establish Swarm installation,
-  integration between Bugzilla and Perforce (P4DTG) on various vituralized hardware. Established
-  and maintained documentation of various Dev/Test/Prod environments throughout the organization.</p>
+  <p>Worked in the Devops group performing Linux Admin, Perforce Admin and
+  maintaining an inhouse developed build system that utilizes Perl/PHP/Apache/Linux/Windows
+  servers to allow engineers in the field to perform customized builds around the
+  world. Helped set up and establish Perforce Swarm installation, integration between
+  Bugzilla and Perforce (P4DTG) on various vituralized hardware. Established and
+  maintained documentation of various Dev/Test/Prod environments throughout the
+  organization. Wrote scripts to import data from Bugzilla to JIRA, assisted with
+  JIRA setup and integration of Salesforce with JIRA.</p>
 
   <hr noshade>