<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15728] CalendarServer/branches/users/cdaboo/better-next-job</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15728">15728</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-06-30 10:00:17 -0700 (Thu, 30 Jun 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge from trunk.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobbin_buildsh">CalendarServer/branches/users/cdaboo/better-next-job/bin/_build.sh</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobbincaldavd">CalendarServer/branches/users/cdaboo/better-next-job/bin/caldavd</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobdocOracleVMReadMemd">CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/ReadMe.md</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobsetuppy">CalendarServer/branches/users/cdaboo/better-next-job/setup.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoresql_tablespy">CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_tables.py</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobdocOracleVMoracleonmacpy">CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/oracle-on-mac.py</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjob">CalendarServer/branches/users/cdaboo/better-next-job/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdaboobetternextjob"></a>
<div class="propset"><h4>Property changes: CalendarServer/branches/users/cdaboo/better-next-job</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/json:11622-11912
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/newlog:15301
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pod2pod-migration:14338-14520
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
</span><span class="cx">/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/cdaboo/update-packages:15273-15284
</span><span class="cx">/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
</span><span class="cx">/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who:12819-12860
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-2:12861-12898
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-3:12899-12913
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-4:12914-13157
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-5:13158-13163
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua:13309-13327
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua-1:13328-13330
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes:13648-13656
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes-2:13657
</span><span class="cx">/CalendarServer/branches/users/sagen/request-socket:14748-14767
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan:14185-14269
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-2:14270-14324
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-3:14325-14450
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-4:14451-14471
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-5:14471-14555
</span><span class="cx">/CalendarServer/branches/users/wsanchez/psycopg2cffi:14427-14439
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><span class="cx">   + /CalDAVTester/trunk:11193-11198
</span><span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/json:11622-11912
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/newlog:15301
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pod2pod-migration:14338-14520
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
</span><span class="cx">/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/cdaboo/update-packages:15273-15284
</span><span class="cx">/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
</span><span class="cx">/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who:12819-12860
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-2:12861-12898
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-3:12899-12913
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-4:12914-13157
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-5:13158-13163
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua:13309-13327
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua-1:13328-13330
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes:13648-13656
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes-2:13657
</span><span class="cx">/CalendarServer/branches/users/sagen/request-socket:14748-14767
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan:14185-14269
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-2:14270-14324
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-3:14325-14450
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-4:14451-14471
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-5:14471-14555
</span><span class="cx">/CalendarServer/branches/users/wsanchez/psycopg2cffi:14427-14439
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><span class="cx">/CalendarServer/trunk:15717-15725
</span><a id="CalendarServerbranchesuserscdaboobetternextjobbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/bin/_build.sh (15727 => 15728)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/bin/_build.sh        2016-06-30 16:51:50 UTC (rev 15727)
+++ CalendarServer/branches/users/cdaboo/better-next-job/bin/_build.sh        2016-06-30 17:00:17 UTC (rev 15728)
</span><span class="lines">@@ -720,6 +720,19 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+macos_oracle () {
+  if [ &quot;${ORACLE_HOME-}&quot; ]; then
+    case &quot;$(uname -s)&quot; in
+      Darwin)
+        echo &quot;macOS Oracle init.&quot;
+        export   LD_LIBRARY_PATH=&quot;${LD_LIBRARY_PATH:-}:${ORACLE_HOME}&quot;;
+        export DYLD_LIBRARY_PATH=&quot;${DYLD_LIBRARY_PATH:-}:${ORACLE_HOME}&quot;;
+        ;;
+    esac;
+  fi;
+}
+
+
</ins><span class="cx"> bootstrap_virtualenv () {
</span><span class="cx">   mkdir -p &quot;${py_ve_tools}&quot;;
</span><span class="cx">   mkdir -p &quot;${py_ve_tools}/lib&quot;;
</span><span class="lines">@@ -801,6 +814,7 @@
</span><span class="cx">   init_build;
</span><span class="cx">   c_dependencies;
</span><span class="cx">   py_dependencies;
</span><ins>+  macos_oracle;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobbincaldavd"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/bin/caldavd (15727 => 15728)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/bin/caldavd        2016-06-30 16:51:50 UTC (rev 15727)
+++ CalendarServer/branches/users/cdaboo/better-next-job/bin/caldavd        2016-06-30 17:00:17 UTC (rev 15728)
</span><span class="lines">@@ -131,4 +131,14 @@
</span><span class="cx"> 
</span><span class="cx"> export PYTHONPATH
</span><span class="cx"> 
</span><ins>+if [ &quot;${ORACLE_HOME-}&quot; ]; then
+  case &quot;$(uname -s)&quot; in
+    Darwin)
+      echo &quot;macOS Oracle init.&quot;
+      export   LD_LIBRARY_PATH=&quot;${LD_LIBRARY_PATH:-}:${ORACLE_HOME}&quot;;
+      export DYLD_LIBRARY_PATH=&quot;${DYLD_LIBRARY_PATH:-}:${ORACLE_HOME}&quot;;
+      ;;
+  esac;
+fi;
+
</ins><span class="cx"> exec &quot;${python}&quot; &quot;${twistdpath}&quot; ${twistd_profile} ${twistd_reactor} ${daemonize} ${username} ${groupname} &quot;${plugin_name}&quot; ${configfile} ${service_type} ${errorlogenabled} ${profile} ${child_reactor} ${extra};
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobdocOracleVMReadMemd"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/ReadMe.md (15727 => 15728)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/ReadMe.md        2016-06-30 16:51:50 UTC (rev 15727)
+++ CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/ReadMe.md        2016-06-30 17:00:17 UTC (rev 15728)
</span><span class="lines">@@ -2,9 +2,38 @@
</span><span class="cx"> 
</span><span class="cx"> ## Setup
</span><span class="cx"> 
</span><ins>+### Oracle instantclient
+
+Download instantclient locally from &quot;http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html&quot;
+
+* instantclient-basic-macos.x64-11.2.0.4.0.zip
+* instantclient-sdk-macos.x64-11.2.0.4.0.zip
+
+Then run:
+
+        mkdir .oracle
+        cd .oracle
+        &lt;&lt;copy instantclient zips here&gt;&gt;
+        unzip instantclient-basic-macos.x64-11.2.0.4.0.zip
+        unzip instantclient-sdk-macos.x64-11.2.0.4.0.zip
+        ln -sf . lib
+        ln -sf libclntsh.dylib.11.1 libclntsh.dylib
+        cd ~
+        cat &gt;&gt; .bash_profile
+    function oracle_11 () {
+        export ORACLE_HOME=&quot;$HOME/.oracle/instantclient_11_2&quot;;
+    
+        # make sure we can find the client libraries
+        export LD_LIBRARY_PATH=&quot;$LD_LIBRARY_PATH:$ORACLE_HOME&quot;;
+        export DYLD_LIBRARY_PATH=&quot;$DYLD_LIBRARY_PATH:$ORACLE_HOME&quot;;
+    }
+    ^D
+
+### Local Oracle Database
+If you want to run your own Oracle database rather than use an existing one:
+
</ins><span class="cx"> * Get VirtualBox
</span><span class="cx"> * Install OTN\_Developer\_Day\_VM\_12c.otn
</span><del>-* Install instantclient locally
</del><span class="cx"> 
</span><span class="cx"> ## Run
</span><span class="cx"> 
</span><span class="lines">@@ -16,13 +45,13 @@
</span><span class="cx"> * In sqlplus: `@rebuild;`
</span><span class="cx"> 
</span><span class="cx"> ### CS
</span><del>-* Configure the DB:
</del><ins>+* Run the `oracle_11` alias to make sure paths are setup.
+* Rebuild the server with `bin/develop` to ensure the `cx_Oracle` module is built
+* Configure the DB in caldav-dev.plist:
</ins><span class="cx"> 
</span><span class="cx">     endpoint: tcp:192.168.56.101:1521
</span><span class="cx">     database: orcl
</span><span class="cx">     user: hr
</span><span class="cx">     password: oracle
</span><span class="cx"> 
</span><del>-* Paths: ensure that `~/.oracle/instantclient_xxx` is in `LD_LIBRARY_PATH`, `DYLD_LIBRARY_PATH`, and `ORACLE_HOME`
-
</del><span class="cx"> * Run server
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobdocOracleVMoracleonmacpy"></a>
<div class="delfile"><h4>Deleted: CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/oracle-on-mac.py (15727 => 15728)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/oracle-on-mac.py        2016-06-30 16:51:50 UTC (rev 15727)
+++ CalendarServer/branches/users/cdaboo/better-next-job/doc/OracleVM/oracle-on-mac.py        2016-06-30 17:00:17 UTC (rev 15728)
</span><span class="lines">@@ -1,84 +0,0 @@
</span><del>-
-import webbrowser
-
-from pipes import quote as shellquote
-from textwrap import wrap, dedent
-from os.path import exists, expanduser, join as j
-from os import mkdir, symlink
-from errno import EEXIST, EISDIR
-from zipfile import ZipFile
-
-dlpage = &quot;http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html&quot;
-
-downloads = [
-    &quot;instantclient-basic-macos.x64-11.2.0.4.0.zip&quot;,
-    &quot;instantclient-sdk-macos.x64-11.2.0.4.0.zip&quot;,
-    &quot;instantclient-sqlplus-macos.x64-11.2.0.4.0.zip&quot;,
-]
-
-ordir = expanduser(&quot;~/.oracle&quot;)
-
-
-
-def mkdirp(d):
-    try:
-        mkdir(d)
-    except OSError, ose:
-        if ose.errno not in (EEXIST, EISDIR):
-            pass
-mkdirp(ordir)
-
-
-
-def downloaded():
-    for download in downloads:
-        dl = j(expanduser(&quot;~/Downloads/OracleDB&quot;), download)
-        if exists(dl):
-            ZipFile(dl).extractall(ordir)
-            continue
-        break
-    else:
-        return True
-    return False
-
-import fcntl
-import tty
-import struct
-th, tw, ign, ign = struct.unpack(&quot;4H&quot;, fcntl.ioctl(0, tty.TIOCGWINSZ, 'x' * 8))
-
-while not downloaded():
-    txt = &quot;\n&quot;.join(wrap(&quot; &quot;.join(&quot;&quot;&quot;
- Please sanctify the files, which I cannot automatically download, with your
- consent to abide by their respective license agreements via your web browser,
- then hit 'enter' to continue.  You need:
-        &quot;&quot;&quot;.split()), tw)) + &quot;\n\n&quot; + &quot;\n&quot;.join(downloads)
-    webbrowser.open(dlpage)
-    raw_input(txt)
-
-instantclient = j(ordir, &quot;instantclient_11_2&quot;)
-
-# # Oracle is for Professional Software Engineers only.  Don't look for any namby-
-# # pamby &quot;user interface&quot; or &quot;working installation process&quot; here!
-for pdest in [&quot;libclntsh.dylib.11.2&quot;, &quot;libclntsh.dylib.11.1&quot;]:
-    pdestfull = j(instantclient, pdest)
-    psrcfull = j(instantclient, &quot;libclntsh.dylib&quot;)
-    if exists(pdestfull) and not exists(psrcfull):
-        symlink(pdestfull, psrcfull)
-        break
-
-ldestfull = j(instantclient, &quot;lib&quot;)
-if not exists(ldestfull):
-    symlink(&quot;.&quot;, ldestfull)
-
-with open(expanduser(&quot;~/.bash_profile&quot;), &quot;a&quot;) as f:
-    f.write(dedent(
-        &quot;&quot;&quot;
-        function oracle_11 () {
-            export ORACLE_HOME=&quot;$HOME/.oracle/instantclient_11_2&quot;;
-
-            # make sure we can find the client libraries
-            export LD_LIBRARY_PATH=&quot;$LD_LIBRARY_PATH:$ORACLE_HOME&quot;;
-            export DYLD_LIBRARY_PATH=&quot;$DYLD_LIBRARY_PATH:$ORACLE_HOME&quot;;
-        }
-        &quot;&quot;&quot;))
-
</del></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobsetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/setup.py (15727 => 15728)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/setup.py        2016-06-30 16:51:50 UTC (rev 15727)
+++ CalendarServer/branches/users/cdaboo/better-next-job/setup.py        2016-06-30 17:00:17 UTC (rev 15728)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> import subprocess
</span><span class="cx"> import sys
</span><span class="cx"> 
</span><del>-base_version = &quot;9.0&quot;
</del><ins>+base_version = &quot;9.1&quot;
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> #
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoresql_tablespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_tables.py (15727 => 15728)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_tables.py        2016-06-30 16:51:50 UTC (rev 15727)
+++ CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_tables.py        2016-06-30 17:00:17 UTC (rev 15728)
</span><span class="lines">@@ -335,6 +335,8 @@
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     for sequence in schema.model.sequences:
</span><span class="cx">         out.write('create sequence %s;\n' % (sequence.name,))
</span><ins>+    out.write(&quot;\n\n&quot;)
+
</ins><span class="cx">     for table in schema:
</span><span class="cx">         # The only table name which actually exceeds the length limit right now
</span><span class="cx">         # is CALENDAR_OBJECT_ATTACHMENTS_MODE, which isn't actually _used_
</span><span class="lines">@@ -421,7 +423,9 @@
</span><span class="cx">                         for (cmodel, val) in row.items()])
</span><span class="cx">             out.write(_staticSQL(Insert(cmap)))
</span><span class="cx">             out.write(&quot;;\n&quot;)
</span><ins>+        out.write(&quot;\n\n&quot; if len(table.model.schemaRows) else &quot;\n&quot;)
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx">     for index in schema.model.indexes:
</span><span class="cx">         # Index names combine and repeat multiple table names and column names,
</span><span class="cx">         # so several of them conflict once oracle's length limit is applied.
</span></span></pre>
</div>
</div>

</body>
</html>