This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/spark-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 6f828ad Fix confict warning on spark-summit-east-agenda-posted
6f828ad is described below
commit 6f828ad4951d9ac1fbfd03087dfe1f304073ecc0
Author: Yikun Jiang <yikunk...@gmail.com>
AuthorDate: Fri Feb 26 22:20:55 2021 +0900
Fix confict warning on spark-summit-east-agenda-posted
When use `bundle exec jekyll build` to generate the htmls, the below error
is raised:
```
Conflict: The following destination is shared by multiple files.
The written file may end up with unexpected contents.
/Users/jiangyikun/spark/spark-website/site/news/spark-summit-east-agenda-posted.html
- spark-website/news/_posts/2015-01-21-spark-summit-east-agenda-posted.md
- spark-website/news/_posts/2016-01-14-spark-summit-east-agenda-posted.md
```
The reason is there were two files have same url suffix:
- 2015-01-21-spark-summit-east-agenda-posted
- 2016-01-14-spark-summit-east-agenda-posted
And there ware only one page is generated, the content is overwriten by the
page with 2016-01-14 date prefix, and the 2015-01-21 one is lost. See [1].
This patch adds year suffix to fix this confict issue.
[1] http://spark.apache.org/news/spark-summit-east-agenda-posted.html
Author: Yikun Jiang <yikunk...@gmail.com>
Closes #314 from Yikun/fix-conflict-warning.
---
...sted.md => 2015-01-21-spark-summit-east-agenda-posted-2015.md} | 0
...sted.md => 2016-01-14-spark-summit-east-agenda-posted-2016.md} | 0
site/news/index.html | 4 ++--
...enda-posted.html => spark-summit-east-agenda-posted-2015.html} | 8 +++++---
...enda-posted.html => spark-summit-east-agenda-posted-2016.html} | 0
site/sitemap.xml | 4 ++--
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/news/_posts/2015-01-21-spark-summit-east-agenda-posted.md
b/news/_posts/2015-01-21-spark-summit-east-agenda-posted-2015.md
similarity index 100%
rename from news/_posts/2015-01-21-spark-summit-east-agenda-posted.md
rename to news/_posts/2015-01-21-spark-summit-east-agenda-posted-2015.md
diff --git a/news/_posts/2016-01-14-spark-summit-east-agenda-posted.md
b/news/_posts/2016-01-14-spark-summit-east-agenda-posted-2016.md
similarity index 100%
rename from news/_posts/2016-01-14-spark-summit-east-agenda-posted.md
rename to news/_posts/2016-01-14-spark-summit-east-agenda-posted-2016.md
diff --git a/site/news/index.html b/site/news/index.html
index 6b5cecb..28233e1 100644
--- a/site/news/index.html
+++ b/site/news/index.html
@@ -626,7 +626,7 @@ well. The current plan is as follows:</p>
<article class="hentry">
<header class="entry-header">
- <h3 class="entry-title"><a
href="/news/spark-summit-east-agenda-posted.html">Spark Summit East (Feb 16,
2016, New York) agenda posted</a></h3>
+ <h3 class="entry-title"><a
href="/news/spark-summit-east-agenda-posted-2016.html">Spark Summit East (Feb
16, 2016, New York) agenda posted</a></h3>
<div class="entry-date">January 14, 2016</div>
</header>
<div class="entry-content"><p>The <a
href="https://spark-summit.org/east-2016/schedule/";>agenda for Spark Summit
East</a> is now posted, with 60 talks from organizations including Netflix,
Comcast, Blackrock, Bloomberg and others. The 2nd annual Spark Summit East will
run February 16-18th in NYC and feature a full program of speakers along with
Spark training opportunities. More details are available on the <a
href="https://spark-summit.org/east-2016/schedule/";>Spark Summit East webs [...]
@@ -784,7 +784,7 @@ The Summit will contain <a
href="https://spark-summit.org/2015/schedule/";>presen
<article class="hentry">
<header class="entry-header">
- <h3 class="entry-title"><a
href="/news/spark-summit-east-agenda-posted.html">Spark Summit East agenda
posted, CFP open for West</a></h3>
+ <h3 class="entry-title"><a
href="/news/spark-summit-east-agenda-posted-2015.html">Spark Summit East agenda
posted, CFP open for West</a></h3>
<div class="entry-date">January 21, 2015</div>
</header>
<div class="entry-content"><p>The <a
href="http://spark-summit.org/east/2015/agenda";>agenda for Spark Summit
East</a> is now posted, with 38 talks from organizations including Goldman
Sachs, Baidu, Salesforce, Novartis, Cisco and others. This inaugural Spark
conference on the US East Coast will run March 18th-19th 2015 in New York City.
More details are available on the <a
href="http://spark-summit.org/east/2015/agenda";>Spark Summit East website</a>,
where you can also <a href="http: [...]
diff --git a/site/news/spark-summit-east-agenda-posted.html
b/site/news/spark-summit-east-agenda-posted-2015.html
similarity index 86%
copy from site/news/spark-summit-east-agenda-posted.html
copy to site/news/spark-summit-east-agenda-posted-2015.html
index fb456cd..ae1d331 100644
--- a/site/news/spark-summit-east-agenda-posted.html
+++ b/site/news/spark-summit-east-agenda-posted-2015.html
@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>
- Spark Summit East (Feb 16, 2016, New York) agenda posted | Apache Spark
+ Spark Summit East agenda posted, CFP open for West | Apache Spark
</title>
@@ -200,10 +200,12 @@
</div>
<div class="col-md-9 col-md-pull-3">
- <h2>Spark Summit East (Feb 16, 2016, New York) agenda posted</h2>
+ <h2>Spark Summit East agenda posted, CFP open for West</h2>
-<p>The <a href="https://spark-summit.org/east-2016/schedule/";>agenda for Spark
Summit East</a> is now posted, with 60 talks from organizations including
Netflix, Comcast, Blackrock, Bloomberg and others. The 2nd annual Spark Summit
East will run February 16-18th in NYC and feature a full program of speakers
along with Spark training opportunities. More details are available on the <a
href="https://spark-summit.org/east-2016/schedule/";>Spark Summit East
website</a>, where you can also <a [...]
+<p>The <a href="http://spark-summit.org/east/2015/agenda";>agenda for Spark
Summit East</a> is now posted, with 38 talks from organizations including
Goldman Sachs, Baidu, Salesforce, Novartis, Cisco and others. This inaugural
Spark conference on the US East Coast will run March 18th-19th 2015 in New York
City. More details are available on the <a
href="http://spark-summit.org/east/2015/agenda";>Spark Summit East website</a>,
where you can also <a href="http://prevalentdesignevents.com/spa [...]
+
+<p>In addition, talk proposals are now open for <a
href="http://spark-summit.org/2015";>Spark Summit West</a>, to run in San
Francisco on June 15-17, 2015. We expect Spark Summit West to be the largest
Spark community conference yet, with nearly 2000 attendees, so send in your
talks if you have exciting use cases, tutorials, or development talks about
Spark. You can submit your talk through the <a
href="http://prevalentdesignevents.com/sparksummit2015/speaker/";>online
submission form</a>. [...]
<p>
diff --git a/site/news/spark-summit-east-agenda-posted.html
b/site/news/spark-summit-east-agenda-posted-2016.html
similarity index 100%
rename from site/news/spark-summit-east-agenda-posted.html
rename to site/news/spark-summit-east-agenda-posted-2016.html
diff --git a/site/sitemap.xml b/site/sitemap.xml
index d39b3a2..914f6e4 100644
--- a/site/sitemap.xml
+++ b/site/sitemap.xml
@@ -443,7 +443,7 @@
<changefreq>weekly</changefreq>
</url>
<url>
- <loc>https://spark.apache.org/news/spark-summit-east-agenda-posted.html</loc>
+
<loc>https://spark.apache.org/news/spark-summit-east-agenda-posted-2016.html</loc>
<changefreq>weekly</changefreq>
</url>
<url>
@@ -551,7 +551,7 @@
<changefreq>weekly</changefreq>
</url>
<url>
- <loc>https://spark.apache.org/news/spark-summit-east-agenda-posted.html</loc>
+
<loc>https://spark.apache.org/news/spark-summit-east-agenda-posted-2015.html</loc>
<changefreq>weekly</changefreq>
</url>
<url>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
