From 4694475a282464d3b35354242615275a01731110 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Wed, 19 Oct 2016 00:05:11 -0700 Subject: [PATCH] Update notes for 2016-10-18 --- content/post/2016-10.md | 2 ++ public/2016-10/index.html | 4 ++++ public/index.xml | 4 ++++ public/post/index.xml | 4 ++++ public/tags/notes/index.xml | 4 ++++ 5 files changed, 18 insertions(+) diff --git a/content/post/2016-10.md b/content/post/2016-10.md index d05e06219..5b73bb23b 100644 --- a/content/post/2016-10.md +++ b/content/post/2016-10.md @@ -110,3 +110,5 @@ $ ./fix-metadata-values.py -i ccafs-authors-oct-16.csv -f dc.contributor.author - Skip 1e34751b8cf17021f45d4cf2b9a5800c93fb4cb2 in lieu of upstream's 55e623d1c2b8b7b1fa45db6728e172e06bfa8598 (fixes X-Forwarded-For header) because I had made the same fix myself and it's better to use the upstream one - I notice this rebase gets rid of GitHub merge commits... which actually might be fine because merges are fucking annoying to deal with when remote people merge without pulling and rebasing their branch first - Finished up applying the 5.5 sitemap changes to all themes +- Merge the `discovery.xml` cleanups ([#278](https://github.com/ilri/DSpace/pull/278)) +- Merge some minor edits to the distribution license ([#285](https://github.com/ilri/DSpace/pull/285)) diff --git a/public/2016-10/index.html b/public/2016-10/index.html index 9d8ffb075..547dfd8fd 100644 --- a/public/2016-10/index.html +++ b/public/2016-10/index.html @@ -227,6 +227,10 @@ $ git rebase -i dspace-5.5

  • I notice this rebase gets rid of GitHub merge commits… which actually might be fine because merges are fucking annoying to deal with when remote people merge without pulling and rebasing their branch first

  • Finished up applying the 5.5 sitemap changes to all themes

    • + +

  • Merge the discovery.xml cleanups (#278)

    • + +

  • Merge some minor edits to the distribution license (#285)

    • diff --git a/public/index.xml b/public/index.xml index 5938c414c..9d03bce19 100644 --- a/public/index.xml +++ b/public/index.xml @@ -154,6 +154,10 @@ $ git rebase -i dspace-5.5</p></li> <li><p>I notice this rebase gets rid of GitHub merge commits&hellip; which actually might be fine because merges are fucking annoying to deal with when remote people merge without pulling and rebasing their branch first</p></li> <li><p>Finished up applying the 5.5 sitemap changes to all themes</p></li> + +<li><p>Merge the <code>discovery.xml</code> cleanups (<a href="https://github.com/ilri/DSpace/pull/278">#278</a>)</p></li> + +<li><p>Merge some minor edits to the distribution license (<a href="https://github.com/ilri/DSpace/pull/285">#285</a>)</p></li> </ul> diff --git a/public/post/index.xml b/public/post/index.xml index 7dec835fc..dcc9889c3 100644 --- a/public/post/index.xml +++ b/public/post/index.xml @@ -154,6 +154,10 @@ $ git rebase -i dspace-5.5</p></li> <li><p>I notice this rebase gets rid of GitHub merge commits&hellip; which actually might be fine because merges are fucking annoying to deal with when remote people merge without pulling and rebasing their branch first</p></li> <li><p>Finished up applying the 5.5 sitemap changes to all themes</p></li> + +<li><p>Merge the <code>discovery.xml</code> cleanups (<a href="https://github.com/ilri/DSpace/pull/278">#278</a>)</p></li> + +<li><p>Merge some minor edits to the distribution license (<a href="https://github.com/ilri/DSpace/pull/285">#285</a>)</p></li> </ul> diff --git a/public/tags/notes/index.xml b/public/tags/notes/index.xml index b1c45b0da..419a5da5d 100644 --- a/public/tags/notes/index.xml +++ b/public/tags/notes/index.xml @@ -153,6 +153,10 @@ $ git rebase -i dspace-5.5</p></li> <li><p>I notice this rebase gets rid of GitHub merge commits&hellip; which actually might be fine because merges are fucking annoying to deal with when remote people merge without pulling and rebasing their branch first</p></li> <li><p>Finished up applying the 5.5 sitemap changes to all themes</p></li> + +<li><p>Merge the <code>discovery.xml</code> cleanups (<a href="https://github.com/ilri/DSpace/pull/278">#278</a>)</p></li> + +<li><p>Merge some minor edits to the distribution license (<a href="https://github.com/ilri/DSpace/pull/285">#285</a>)</p></li> </ul>