Merge "Cleanup planet.ini and images"

planet.ini

@@ -34,13 +34,13 @@ bill_of_materials:
 facewidth = 85
 faceheight = 85
 
-[http://openstack.org/blog/feed/]
+[http://www.openstack.org/blog/feed/]
 name = OpenStack Blog
 nick = openstack
 
 # Subscription configuration
 
-[http://assafmuller.wordpress.com/category/openstack/feed]
+[http://assafmuller.com/category/openstack/feed/]
 name = Assaf Muller
 nick = amuller
 face = amuller.png
@@ -55,25 +55,16 @@ name = James E. Blair
 nick = corvus
 #face = corvus.png
 
-[http://blog.warma.dk/tag/planetopenstack/feed]
+[http://blog.warma.dk/tag/planetopenstack/feed/]
 name = Soren Hansen
 nick = soren
 face = soren.png
 
-[http://joinfu.com/category/openstack/feed/]
+[http://www.joinfu.com/category/openstack/feed/]
 name = Jay Pipes
 nick = jaypipes
 face = jaypipes.png
 
-[http://www.cognition.ca/category/cloud/feed]
-name = Joshua McKenty
-nick = joshuamckenty
-face = joshuamckenty.png
-
-[http://omgmike.com/rss?tag=openstack]
-name = Michael Barton
-nick = redbo
-
 [http://programmerthoughts.com/openstack/openstackposts.xml]
 name = John Dickinson
 nick = notmyname
@@ -84,16 +75,6 @@ name = Thierry Carrez
 nick = ttx
 face = ttx.png
 
-[http://www.rhonabwy.com/wp/category/geekstuff/openstack/feed/]
-name = Joe Heck
-nick = heckj
-face = heckj.png
-
-[http://www.unitedstack.com/blog/openstack/]
-name = UnitedStack
-face = UnitedStack.png
-nick = UnitedStack
-
 [http://justwriteclick.com/tag/openstack/feed/]
 name = Anne Gentle
 nick = annegentle
@@ -102,19 +83,13 @@ face = annegentle.png
 [http://www.bretpiatt.com/blog/category/openstack/feed/]
 name = Bret Piatt
 nick = bpiatt
-face = BretPiatt.JPG
+face = BretPiatt.jpg
 
 [http://ryandlane.com/blog/category/openstack/feed/]
 name = Ryan Lane
 nick = rlane
-#face = ryanlane.png
 
-[http://www.jordanrinke.com/category/work/openstack/feed/]
+[https://openstackgd.wordpress.com/feed/]
-name = Jordan Rinke
-nick = JordanRinke
-face = jordanrinke.png
-
-[http://openstackgd.wordpress.com/feed/]
 name = Grid Dynamics OpenStack Team
 nick = openstackgd
 face = griddynamics.png
@@ -149,17 +124,12 @@ name = Michael Still
 nick = mikal
 face = mikal.png
 
-[http://www.linuxjedi.co.uk/feeds/posts/default/-/openstack]
+[https://ubuntuserver.wordpress.com/tag/openstack/feed/]
-name = Andrew Hutchings
-nick = linuxjedi
-face = linuxjedi.png
-
-[http://ubuntuserver.wordpress.com/tag/openstack/feed/]
 name = Ubuntu Server & Cloud blog
 nick = Ubuntu
 face = ubuntuserver.png
 
-[http://swiftstack.com/blog/categories/planetopenstack/atom.xml]
+[https://swiftstack.com/blog/categories/planetopenstack/atom.xml]
 name = SwiftStack Team
 nick = swiftstack
 face = swiftstack.png
@@ -193,7 +163,7 @@ nick = Madkiss
 facewidth = 67
 faceheight = 100
 
-[http://mirantis.com/blog/feed/]
+[https://www.mirantis.com/blog/feed/]
 name = Mirantis
 face = mirantis.png
 facewidth = 84
@@ -206,7 +176,7 @@ face = fghaas.png
 faceheight = 100
 facewidth = 75
 
-[http://russellbryantnet.wordpress.com/category/openstack/feed/]
+[http://blog.russellbryant.net/category/openstack/feed/]
 name = Russell Bryant
 nick = russellb
 face = russellb.png
@@ -225,14 +195,7 @@ name = John Garbutt
 nick = johngarbutt
 face = johngarbutt.png
 
-[http://cloudcenter.sinaapp.com/category/openstack/feed]
+[http://sdake.io/tag/openstack/feed/]
-name = yaguang tang
-nick = yaguang
-face = yaguangtang.png
-faceheight=107
-facewidth = 79
-
-[http://sdake.wordpress.com/tag/openstack/feed/]
 name = Steve Dake
 nick = sdake
 face = sdake.png
@@ -249,14 +212,13 @@ face = amarkapadia.png
 
 [http://www.sebastien-han.fr/openstack.xml]
 name = Sébastien Han
-face = leseb.png
 nick = leseb
 
 [http://secstack.org/category/openstack/feed/]
 name = OpenStack Security Blog
 nick = SecStack
 
-[http://lorinhochstein.wordpress.com/category/openstack/feed/atom/]
+[https://lorinhochstein.wordpress.com/category/openstack/feed/atom/]
 name = Lorin Hochstein
 face = lorin.png
 nick = lorin
@@ -279,7 +241,7 @@ name = Derek Higgins
 face = derekh.png
 nick = derekh
 
-[http://my1.fr/blog/category/virtualization/openstack/feed/atom]
+[http://my1.fr/blog/category/virtualization/openstack/feed/atom/]
 name = Emilien Macchi
 face = emilienm.png
 nick = EmilienM
@@ -294,16 +256,11 @@ name = Adam Young
 face = ayoung.png
 nick = ayoung
 
-[http://julien.danjou.info/blog/tags/openstack.xml]
+[https://julien.danjou.info/blog/tags/openstack.xml]
 name = Julien Danjou
 face = jdanjou.jpg
 nick = jdanjou
 
-[http://freedomhui.com/feed/]
-name = Hui Cheng
-face = ChengHui.png
-nick = freedomhui
-
 [http://www.markshuttleworth.com/archives/tag/openstack/feed]
 name = Mark Shuttleworth
 face = Mark-Shuttleworth-3.jpg
@@ -314,7 +271,7 @@ name = Hendrik Volkmer
 face = hvolkmer.jpg
 nick = hvolkmer
 
-[http://leastresistance.wordpress.com/category/openstack/feed/]
+[https://leastresistance.wordpress.com/category/openstack/feed/]
 name = Matt Ray
 face = mattray.png
 nick = mattray
@@ -333,11 +290,11 @@ name = Pádraig Brady
 face = pbrady.png
 nick = pbrady
 
-[http://www.siliconloons.com/?tag=openstack&feed=rss2]
+[http://www.siliconloons.com/categories/openstack/index.xml]
 name = Kyle Mestery
 nick = mestery
 
-[http://blog.berendt.io/tag/openstack-planet/rss/]
+[https://blog.berendt.io/tag/openstack-planet/rss/]
 name = Christian Berendt
 nick = berendt
 
@@ -353,7 +310,7 @@ nick = vuntz
 facewidth = 90
 faceheight = 73
 
-[http://www.17od.com/?tag=openstack&feed=rss2]
+[http://www.17od.com/tag/openstack/feed/]
 name = Adrian Smith
 face = adrian17od.png
 nick = adrian17od
@@ -381,7 +338,7 @@ name = John Bresnahan
 face = jbresnah.png
 nick = jbresnah
 
-[http://rbtcollins.wordpress.com/tag/openstack/feed/atom/]
+[https://rbtcollins.wordpress.com/tag/openstack/feed/atom/]
 name = Robert Collins
 nick = lifeless
 
@@ -402,7 +359,7 @@ nick = red-trela
 name = Flavio Percoco
 nick = flaper87
 
-[http://dague.net/category/openstack/feed/]
+[https://dague.net/category/openstack/feed/]
 name = Sean Dague
 nick = sdague
 face = sdague.png
@@ -419,7 +376,7 @@ faceheight = 82
 [http://blog.stevebaker.org/feeds/posts/default/-/openstack]
 name = Steve Baker
 nick = stevebaker
-face = stevebaker.jpeg
+face = stevebaker.jpg
 facewidth = 82
 faceheight = 82
 
@@ -435,18 +392,11 @@ name = Dan Smith
 nick = dansmith
 face = dansmith.png
 
-[http://kashyapc.wordpress.com/tag/openstack/feed/]
+[http://kashyapc.com/tag/openstack/feed/]
 name = Kashyap Chamarthy
 face = kashyapc.png
 nick = kashyapc
 
-[http://blog.xlcloud.me/feed/category/Cloud-Computing/OpenStack/atom]
-name = XLcloud
-face = xlcloud.png
-nick = XLcloud
-facewidth = 100
-faceheight = 100
-
 [http://cloudystuffhappens.blogspot.com/feeds/posts/default/-/openstack]
 name = Yun Mao
 nick = maoy
@@ -456,7 +406,7 @@ name = Ceph
 face = ceph.png
 nick = ceph
 
-[http://dreamhost.com/dreamscape/tag/openstack/feed/]
+[http://www.dreamhost.com/dreamscape/tag/openstack/feed/]
 name = DreamHost
 face = dreamhost.png
 nick = dreamhost
@@ -471,19 +421,19 @@ facewidth = 100
 [http://getcloudify.org/tags/OpenStack/atom.xml]
 name = Cloudify Engineering
 
-[http://engineering.spilgames.com/category/planetopenstack/feed]
+[http://engineering.spilgames.com/category/planetopenstack/feed/]
 name = Spilgames Engineering
 nick = spilgames
 face = spilgames.png
 
-[http://jfehlig.wordpress.com/category/openstack/feed/]
+[https://jfehlig.wordpress.com/category/openstack/feed/]
 name = Jim Fehlig
 face = jfehlig.png
 nick = jimfehlig
 facewidth = 100
 faceheight = 86
 
-[http://www.giuliofidente.com/feeds/tag/openstack.atom.xml]
+[http://giuliofidente.com/feeds/tag/openstack.atom.xml]
 name = Giulio Fidente
 face = gfidente.png
 nick = gfidente
@@ -505,7 +455,7 @@ name = Clint Byrum
 face = SpamapS.png
 nick = SpamapS
 
-[http://benjaminkerensa.com/category/openstack/feed/]
+[http://benjaminkerensa.com/category/openstack/feed]
 name = Benjamin Kerensa
 face = bkerensa.png
 nick: bkerensa
@@ -513,7 +463,7 @@ nick: bkerensa
 [http://feeds.feedburner.com/SimplicityScales?format=xml]
 name = Cloudscaling Engineering
 
-[http://aababilov.wordpress.com/category/openstack-2/feed/]
+[https://aababilov.wordpress.com/category/openstack-2/feed/]
 name = Alessio Ababilov
 face = aababilov.png
 nick = aababilov
@@ -533,17 +483,12 @@ name = TelekomCloud DevOps team
 face = telekomcloud.png
 nick = telekomcloud
 
-[http://www.cloudactual.com/feeds/posts/default/-/openstack]
-name = Thomas Kraus
-face = tkraus.png
-nick = tkraus
-
 [http://openstackreactions.enovance.com/category/planet/feed/]
 name = OpenStack Reactions
 face = openstackreactions.png
 nick = OpenStackReactions
 
-[http://sbauza.wordpress.com/tag/openstack/feed/]
+[https://sbauza.wordpress.com/tag/openstack/feed/]
 name = Sylvain Bauza
 face = sbauza.png
 nick = sbauza
@@ -573,7 +518,7 @@ name = Fabien Boucher
 face = fbo.png
 nick = fbo
 
-[http://tobinkeith.wordpress.com/category/openstack/feed/atom/]
+[http://cloud-guy.net/category/openstack/feed/atom/]
 name = Keith Tobin
 nick = ktobin
 
@@ -592,7 +537,7 @@ name = OpenStack in Production
 face = noggin143.png
 
 [http://www.rackspace.com/blog/tag/openstack/feed/]
-name = The Official Rackspace Blog » OpenStack
+name = The Official Rackspace Blog
 face = logo-rackspace.png
 
 [http://cloudarchitectmusings.com/tag/openstack/feed/]
@@ -607,7 +552,7 @@ face = lordkrandel.png
 faceheight = 100
 facewidth = 100
 
-[http://openstackindia.wordpress.com/feed/]
+[https://openstackindia.wordpress.com/feed/]
 name = OpenStack India
 face = Flag_of_India.png
 faceheight = 67
@@ -667,7 +612,7 @@ nick = jiangang
 name = Red Hat Stack
 nick = RedHat
 
-[http://trickycloud.wordpress.com/category/openstack/feed/atom/]
+[https://trickycloud.wordpress.com/category/openstack/feed/atom/]
 name = Ramon Acedo
 nick = racedo
 face = racedo.png
@@ -676,12 +621,12 @@ face = racedo.png
 name = Cindy Pallares
 nick = cpallares
 
-[http://uxd-stackabledesign.rhcloud.com/?feed=rss2&cat=3]
+[http://uxd-stackabledesign.rhcloud.com/category/openstack/feed/]
 name = Liz Blanchard
 face = lblanchard.png
 nick = lblanchard
 
-[http://mirandazhangq.wordpress.com/category/openstack/feed/atom/]
+[https://mirandazhangq.wordpress.com/category/openstack/feed/atom/]
 name = Miranda ZHANG
 face = MirandaZhang.jpg
 nick = MirandaZhang
@@ -698,11 +643,6 @@ face = aptira.png
 [http://blog.adityapatawari.com/feeds/posts/default/-/OpenStack]
 name = Aditya Patawari
 nick = adimania
-face = adimania.jpg
-
-[http://sayalilunkad.github.io/openstack.xml]
-name = Sayali Lunkad
-nick = sayalilunkad
 
 [http://blog-slagle.rhcloud.com/?feed=rss2&tag=OpenStack]
 name = James Slagle
@@ -714,7 +654,7 @@ name = Florent Flament
 face = florentflament.png
 nick = florentflament
 
-[http://spinningmatt.wordpress.com/category/openstack/feed/atom/]
+[https://spinningmatt.wordpress.com/category/openstack/feed/atom/]
 name = Matthew Farrellee
 nick = mattf
 
@@ -727,7 +667,7 @@ name = Opensource.com
 face = opensourcecom.png
 nick = Opensource.com » OpenStack
 
-[http://lizards.opensuse.org/tag/openstack/feed/]
+[https://lizards.opensuse.org/tag/openstack/feed/]
 name = openSUSE Lizards
 face = opensuse.png
 nick = openSUSE
@@ -737,10 +677,10 @@ name = Sascha Peilicke
 face = saschpe.png
 nick = saschpe
 
-[http://javacruft.wordpress.com/category/openstack/feed/]
+[https://javacruft.wordpress.com/category/openstack/feed/]
 name = James Page
-face = james-page.png
 nick = james-page
+face = james-page.jpg
 
 [http://technodrone.blogspot.com/feeds/posts/default/-/OpenStack]
 name = Maish Saidel-Keesing
@@ -756,7 +696,7 @@ face = solinea.png
 name = Ben Nemec
 nick = bnemec
 
-[http://www.mysqlperformanceblog.com/category/openstack/feed/]
+[http://www.percona.com/blog/category/openstack/feed/]
 name = Percona
 face = perconalogo.png
 facewidth = 100
@@ -813,7 +753,7 @@ name = hastexo
 face = hastexo.png
 nick = hastexo
 
-[http://griffithscorner.wordpress.com/category/openstack/feed/]
+[https://griffithscorner.wordpress.com/category/openstack/feed/]
 name = John Griffith
 face = jgriffith.png
 nick = jgriffith
@@ -833,7 +773,7 @@ name = Terry Wilson
 face = otherwiseguy.png
 nick = otherwiseguy
 
-[http://www.pistoncloud.com/category/OpenStack/feed/]
+[http://pistoncloud.com/category/OpenStack/feed/]
 name = Piston
 face = piston.png
 nick = Piston
@@ -893,11 +833,11 @@ name = Miguel Ángel Ajo
 nick = mangelajo
 face = mangelajo.png
 
-[http://ahsalkeld.wordpress.com/category/openstack/feed/atom/]
+[https://ahsalkeld.wordpress.com/category/openstack/feed/atom/]
 name = Angus Salkeld
 nick = asalkeld
 
-[http://virtualandy.wordpress.com/tag/openstack/feed/atom/]
+[https://virtualandy.wordpress.com/tag/openstack/feed/atom/]
 name = Andy Hill
 nick = andyhky
 
@@ -905,11 +845,11 @@ nick = andyhky
 name = Dean Troyer
 nick = dtroyer
 
-[http://chris.yeoh.info/category/openstack/]
+[http://chris.yeoh.info/category/openstack/feed/]
 name = Chris Yeoh
 nick = cbkyeoh
 
-[http://www.jaddog.org/category/openstack/]
+[http://www.jaddog.org/category/openstack/feed/]
 name = Dan Radez
 nick = radez
 face = radez.jpg
@@ -944,7 +884,6 @@ nick = zer0c00l
 
 [http://blog.briancurtin.com/categories/openstack.xml]
 name = Brian Curtin
-face = briancurtin.png
 nick = briancurtin
 faceheight = 90
 facewidth = 100
@@ -954,7 +893,7 @@ name = Marton Kiss
 nick = marton-kiss
 face = marton-kiss.jpg
 
-[http://shaifaliagrawal.wordpress.com/category/openstack/feed/]
+[https://shaifaliagrawal.wordpress.com/category/openstack/feed/]
 name = Shaifali Agrawal
 face = exploreshaifali.png
 nick = exploreshaifali