Alameda County is where Oakland, California is. Here's their page on how to store water long-term while we wait for the next big quake:

http://www.acwd.org/faq.php5?category_id=57

It covers tap water and store-bought bottled water, how to treat, how long to store (in liquid state). I note that they don't expect the water to be frozen and suggest filling to the brim, leaving as little air in the container as possible.

I've had questions about some of their suggestions and have emailed them (their contact link is at the top of the page) with my questions and gotten thoughtful, real answers from guys who seem to know what they're doing.

I freeze water in containers for camping at Burning Man. I use the containers as ice for the ice chest, then drink it after it melts. Not filling the container full is a good idea, but it doesn't always prevent containers from cracking. Water expands in all directions as it freezes, not just up (where the air space is). I haven't had a lot of containers crack, but over the years I've had a few leak from breakage. Maybe from ice expansion, maybe from brittleness of the container. I freeze these containers with tap water the week before we leave, and all are consumed by the end of the following week, so long-term issues don't apply to my use.