Differences

This shows you the differences between two versions of the page.

--- puppet [2017/12/01 09:31] – RomainTartiere
+++ puppet [2020/10/18 20:09] (current) – Link to choria which replace MCollective, and add egypcio@ to the list of puppet@ members RomainTartiere
@@ Line 1: / Line 1: @@
+  * [[Puppet/GettingStarted|GettingStarted]]
 ====== Puppet ======
-The Puppet team aims to maintain [[https://docs.puppet.com/puppet/latest/|Puppet]] and [[https://docs.puppet.com/mcollective/|Marionette Collective]] for %%FreeBSD%%.
+The Puppet team aims to maintain [[https://docs.puppet.com/puppet/latest/|Puppet]] and [[https://choria.io/|Choria]] (previously [[https://puppet.com/docs/mcollective/current/index.html|Marionette Collective]]) for %%FreeBSD%%.
 These ports have been created by various contributors to the %%FreeBSD%% project, requiring synchronization between maintainers for updating.  The puppet@ team was therefore created to simplify this process.
@@ Line 11: / Line 13: @@
 ===== Current list of people in puppet@ =====
-  * JasonSlagle (jslagle@gmail.com)
+  * JasonSlagle (jslagleatgmail.com)
   * RomainTartiere (romain@)
   * TimBishop (tdb@)
   * TomJudge (tj@)
+  * ViniciusZavam (egypcio@)
   * ZachLeslie (zleslie@)
@@ Line 64: / Line 67: @@
 ----
-{{tag>Team}}
+{{tag>Ports Team}}