Merge "Lightning talk on submit requirements: speaker changed to Luca"
diff --git a/schedule.md b/schedule.md
index 5e81dbc..7362915 100644
--- a/schedule.md
+++ b/schedule.md
@@ -52,13 +52,13 @@
 |  9:30 | Welcome introduction
 |  9:45 | [What's new in Gerrit 3.6 and 3.7](sessions/whats-new-gerrit-3.6-3.7.md)
 | 10:30 | [Wrestling large repos with JGit an Gerrit](sessions/wrestling-large-repos.md)
-| 11:15 | __Talk available__
+| 11:15 | [Q&A with the Gerrit Maintainers](sessions/maintainers-qa.md)
 | 12:00 | Lunch & Networking
 | 14:00 | [Gerrit for smoothly switching from SVN to Git](sessions/svn-to-git.md)
-| 14:45 | __Talk available__
+| 14:45 | [Gerrit adoption and NoteDb migration user story](sessions/gerrit-user-story.md)
 | 15:30 | Break & Networking
 | 16:00 | [Using Gerrit with Zuul](sessions/gerrit-and-zuul.md)
-| 16:45 | [Q&A with the Gerrit Maintainers](sessions/maintainers-qa.md)
+| 16:45 | __Talk available__
 | 17:30 | Party and free drinks
 
 ### Friday, 11th of November
@@ -73,8 +73,8 @@
 | 14:00 | [Keeping an eye on your repository metrics](sessions/git-repo-metrics.md)
 | 14:10 | [Status update of the "Gerrit on Kubernetes" project](sessions/k8s-gerrit.md)
 | 14:20 | [Submit requirements - Goodbye Prolog](sessions/submit-requirements.md)
-| 14:30 | __Lightning talk available__
-| 14:40 | __Lightning talk available__
+| 14:30 | [What's new in the OWNERS plugin](sessions/owners-plugin.md)
+| 14:40 | ["checks-jenkins" - A Checks-API implementation for Jenkins](sessions/checks-jenkins.md)
 | 14:50 | __Lightning talk available__
 | 15:00 | Break & Networking
 | 15:30 | Final retrospective and proposals
diff --git a/sessions/checks-jenkins.md b/sessions/checks-jenkins.md
new file mode 100644
index 0000000..4c26c4d
--- /dev/null
+++ b/sessions/checks-jenkins.md
@@ -0,0 +1,19 @@
+# "checks-jenkins" - A Checks-API implementation for Jenkins
+
+The [Checks-API](https://gerrit-review.googlesource.com/Documentation/pg-plugin-checks-api.html)
+was recently added to Gerrit to provide an extension point for plugins that
+collect data from CI systems to display them in the Gerrit UI.
+
+The [checks-jenkins plugin](https://gerrit-review.googlesource.com/admin/repos/plugins/checks-jenkins,general)
+implements the Checks-API for Jenkins CI servers. It relies on the
+[gerritchangequery plugin](https://review.gerrithub.io/admin/repos/tdraebing/gerritchangequery-plugin,general)
+to query job runs working on a patchset in Jenkins and displays the collected
+data in the Gerrit UI. The gerritchangequery plugin supports the gerrit trigger
+plugin and the gerritcodereview plugin.
+
+The presented plugins are still work-in-progress and created during the last
+two Gerrit hackathons.
+
+This talk will be presented online.
+
+*[Thomas Draebing, SAP](../speakers.md#tdraebing)*
diff --git a/sessions/gerrit-user-story.md b/sessions/gerrit-user-story.md
new file mode 100644
index 0000000..46ff461
--- /dev/null
+++ b/sessions/gerrit-user-story.md
@@ -0,0 +1,16 @@
+# How we adopted and evolved Gerrit in the past 6 years
+
+The introduction and adoption of Gerrit in a large enterprise
+like NOKIA comes with challenges and opportunities.
+
+Jose will present how it all started back in 2015 from Alcatel-Lucent and Gerrit
+evolved to an enterprise-level setup with DR-size used by over 15k developers
+worldwide.
+
+Our journey is not over as we are heading to NoteDb and
+further: I would share with you the hurdles we encountered in our upgrade
+process how we plan to move forward to make our setup
+more scalable and up-to-date with the latest and greatest
+version of Gerrit.
+
+*[José Granha - NOKIA](../speakers.md#jgranha)*
diff --git a/sessions/k8s-gerrit.md b/sessions/k8s-gerrit.md
index 03685f4..a4c2ab6 100644
--- a/sessions/k8s-gerrit.md
+++ b/sessions/k8s-gerrit.md
@@ -13,4 +13,4 @@
 
 This talk will be presented online.
 
-*[Thomas Draebing, SAP](../speakers.md#anchor)*
+*[Thomas Draebing, SAP](../speakers.md#tdraebing)*
diff --git a/sessions/maintainers-qa.md b/sessions/maintainers-qa.md
index d8dfa4a..96d8bc9 100644
--- a/sessions/maintainers-qa.md
+++ b/sessions/maintainers-qa.md
@@ -4,4 +4,7 @@
 you've always been wanting to ask.
 
 * *[Luca Milanesio, GerritForge](../speakers.md#lmilanesio)*
-* *other maintainers TBC*
+* *[Edwin Kempin, Google](../speakers.md#ekempin)*
+* *[Ben Rohlfs, Google](../speakers.md#brohlfs)*
+* *[Thomas Draebing, SAP](../speakers.md#tdraebing)*
+* *[Patrick Hiesel, Google](../speakers.md#phiesel)*
diff --git a/sessions/owners-plugin.md b/sessions/owners-plugin.md
new file mode 100644
index 0000000..0cc06bb
--- /dev/null
+++ b/sessions/owners-plugin.md
@@ -0,0 +1,9 @@
+# What's new in the OWNERS plugin
+
+Some new feature have been introduced in the OWNERS plugin in the last months.
+
+Fabio will talk about some REST APIs and OWNERS file logic inheritance
+that have been added to the [plugin](https://gerrit.googlesource.com/plugins/owners/)
+lately.
+
+*[Fabio Ponciroli, GerritForge](../speakers.md#fponciroli)*
\ No newline at end of file
diff --git a/sessions/whats-new-in-pull-replication.md b/sessions/whats-new-in-pull-replication.md
index 0b7699f..989d3c6 100644
--- a/sessions/whats-new-in-pull-replication.md
+++ b/sessions/whats-new-in-pull-replication.md
@@ -3,12 +3,15 @@
 Over the last two year GerritForge took an effort to improve Gerrit replication
 performance by introducing the pull-replication plugin.
 
-In his talk Marcin will focus on the improvements and the new features introduced
+In his talk Marcin and Alvaro will focus on the improvements and the new features introduced
 to the pull-replication plugin:
 * E2E metrics
 * Use events-broker and stream events as a backfill mechanism
 * A new apply-objects REST-API
 * JGit performance improvements
+* Bearer Token Authentication
 * And many other small improvemnents
 
+
 *[Marcin Czech, GerritForge](../speakers.md#mczech)*
+*[Alvaro Vilaplana Garcia, GerritForge](../speakers.md#avilaplana)*
diff --git a/sessions/whats-new-ui.md  b/sessions/whats-new-ui.md
similarity index 100%
rename from sessions/whats-new-ui.md 
rename to sessions/whats-new-ui.md
diff --git a/speakers.md b/speakers.md
index 4d87f62..03b19cd 100644
--- a/speakers.md
+++ b/speakers.md
@@ -88,3 +88,40 @@
 Gerrit open source project. His major contributions to the Gerrit project
 include the redesign of Gerrit's diff cache system and revamping the legacy
 submittability rules in favour of submit requirements.
+
+### Alvaro Vilaplana Garcia - GerritForge {#avilaplana}
+
+[LinkedIn](https://www.linkedin.com/in/avilaplana2008/)
+
+Alvaro is a Senior Software Engineer at GerritForge where he contributes to the
+OpenSource Gerrit Code Review project.
+
+Over the last months he has been involved in the design and development of
+the Bearer Token Authentication in pull-replication.
+
+### Edwin Kempin - Google {#ekempin}
+
+Edwin is a long-time Gerrit contributor. He joined the Gerrit project in 2010,
+became a maintainer in 2012 and assumed the role as community manager in 2019.
+
+Since 2015 he's working at Google in the Gerrit backend team that develops Gerrit
+core and maintains the Gerrit infrastructure at Google.
+Previously Edwin worked 10+ years at SAP where he was responsible for Gerrit
+development and hosting as well.
+
+### José Granha - NOKIA {#jgranha}
+
+[LinkedIn](https://www.linkedin.com/in/jos%C3%A9-granha-3496841/)
+
+José is member of the IT R&D SCM Center of Excellence, located in Lisboa, PT.
+He started in 2019 as a Solution designer for the Gerrit R&D ecosystem in Nokia
+and later became project manager for the SCM architecture transformation and
+enhancement of the company.
+
+### Patrick Hiesel - Google {#phiesel}
+
+Patrick joined Google and the Gerrit project in 2016, working primarily on the
+backend. Since then, he has worked on making Gerrit faster, and more stable as
+well as different features, including (most recently) Submit Requirements.
+
+He is a Gerrit maintainer and a member of the Engineering Steering Committee.