From 2aeb90442d6350e24f5c2a1bc87f5cc9a4aa5009 Mon Sep 17 00:00:00 2001
From: Brian (bex) Exelbierd <bex@pobox.com>
Date: Feb 15 2018 17:26:09 +0000
Subject: Update builder and add outreachy


builder should now also auto-push to production

---

diff --git a/FY18/ledger/council.ldg b/FY18/ledger/council.ldg
index 669f96e..8e6f18f 100644
--- a/FY18/ledger/council.ldg
+++ b/FY18/ledger/council.ldg
@@ -149,3 +149,9 @@
     ; Payment: IE2736503 - Radka Janekova
     Expense:Trade Show               $642.84 ; 13,199.47 CZK
     Council:Other:Fedora Loves .NET   -$642.84
+
+~ every 2 years
+    ; 2018/02/15   Additional funds for Outreachy
+    ; Ticket: https://pagure.io/Fedora-Council/tickets/issue/184
+   Diversity-Inclusion:Unallocated      $6500
+   Council:Unallocated                 -$6500
diff --git a/FY18/ledger/diversity.ldg b/FY18/ledger/diversity.ldg
index 974da94..bfce1fe 100644
--- a/FY18/ledger/diversity.ldg
+++ b/FY18/ledger/diversity.ldg
@@ -81,3 +81,8 @@
     ; Payment: Invoice - PO 1010070451
     Expense:Contributions/Donations     $6500
     Diversity-Inclusion:Outreacy       -$6500
+
+2018-02-12   Software Conservancy - Outreachy
+    ; Payment: Invoice - PO 1010070717 - Spring 2018
+    Expense:Contributions/Donations     $6500
+    Diversity-Inclusion:Outreacy       -$6500
diff --git a/_builder/jenkins_builder b/_builder/jenkins_builder
index 491d16b..dbc3698 100755
--- a/_builder/jenkins_builder
+++ b/_builder/jenkins_builder
@@ -44,3 +44,6 @@ cp -r ../../_package/main/* .
 git add .
 git commit -m "site update"
 git push origin stg
+git checkout prod
+git merge stg
+git push origin prod