[openstack-marconi] (5 commits) ...Update changelog for 2014.1-2 release

[Jon Bernard]

Summary of changes:

  e5c041c... Update gitignore (*)
  c3f8653... Update patches from master-patches
  7badfea... Add custom configuration file
  3a3951d... Use dist config override and other cleanups
  f437c96... Update changelog for 2014.1-2 release

(*) This commit already existed in another branch; no separate mail sent