Merge databases change

jllorencetti · jllorencetti · commit c3c69929932a · 2014-07-29T07:31:44.000Z
diff --git a/databases.html b/databases.html
@@ -176,6 +176,10 @@ <h2>Database third-party services</h2>
   with managed, backed up, replicated, and auto-patched MySQL instances. Cloud
   SQL integrates with Google App Engine but can be used independently as well.</p>
 </li>
+<li>
+<p><a href="http://www.gobitcan.com/">BitCan</a> provides both MySQL and MongoDB hosted
+  databases with extensive backup services.</p>
+</li>
 </ul>
 <h2>Database resources</h2>
 <ul>
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-07-28T22:51:30Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-07-29T07:30:14Z</updated></feed>
diff --git a/source/content/pages/04-data/0401-databases.markdown b/source/content/pages/04-data/0401-databases.markdown
@@ -158,6 +158,9 @@ provider.
   with managed, backed up, replicated, and auto-patched MySQL instances. Cloud
   SQL integrates with Google App Engine but can be used independently as well.
 
+* [BitCan](http://www.gobitcan.com/) provides both MySQL and MongoDB hosted
+  databases with extensive backup services.
+
 
 ## Database resources
 * [DB-Engines](http://db-engines.com/en/ranking) ranks the most popular

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-07-28T22:51:30Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-07-29T07:30:14Z</updated></feed>`