Merge branch 'source' of github.com:promet/promet.github.com into source

promet · Jun 8, 2012 · 22a4f83 · 22a4f83
2 parents 0f2d990 + 6fa8658
commit 22a4f83
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 1 deletion.
diff --git a/source/blog/our-team/gerold-mercadero.html b/source/blog/our-team/gerold-mercadero.html
@@ -0,0 +1,11 @@
+---
+layout: team_member
+title: Gerold Mercadero
+author: gerold-mercadero
+footer: false
+---
+
+Gerold Mercadero
+Systems Administrator
+
+Gerold Mercadero is a Systems Administrator with Promet.  He has been with Promet for 5 years and is from Pampanga, Philippines. He loves being a part of the open source community and enjoys the support and growth that it has seen.  He enjoys working at Promet, improving his skills, and being around fun people.  In his free time he likes to watch movies and animes in Iloilo where he now lives.
diff --git a/source/blog/our-team/greg-palmier.html b/source/blog/our-team/greg-palmier.html
@@ -0,0 +1,11 @@
+---
+layout: team_member
+title: Greg Palmier
+author: greg-palmier
+footer: false
+---
+
+Greg Palmier
+Systems Administrator
+
+A bio has not been made yet for this Prometster :( But don't worry it is on the way and will be avaiable for your viewing pleasure sooner rather than later ;)
diff --git a/source/blog/our-team/joel-scoble.html b/source/blog/our-team/joel-scoble.html
@@ -0,0 +1,8 @@
+---
+layout: team_member
+title: Joel Scoble
+author: joel-scoble
+footer: false
+---
+
+Joel Scoble is a systems administrator at Promethost.
diff --git a/source/blog/our-team/marius-ducea.html b/source/blog/our-team/marius-ducea.html
@@ -5,4 +5,8 @@
 footer: false
 ---
 
-Marius Ducea is an operation engineer at Promethost
+Marius Ducea
+Senior Network Administrator
+
+Marius Ducea is a Systems Administrator for Promet. He has been working for the company since 2006. Marius has more than 10 years of experience in the ISP and web hosting field and he specializes in building and managing large-scale systems and application architectures using open source platforms. Lately he been very interested in systems automation and spends a lot of time with modern configuration management tools like Puppet and Chef. When not working, he likes to spend as much time as possible with his family.
+