[graphite-web/f20: 38/38] Merge branch 'master' into f20

[Jamie Nguyen]

commit 51b1d48303f72d73d23340086c98b833c716f85f
Merge: 34bbc77 ccb4449
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Fri Nov 14 18:44:57 2014 +0000

    Merge branch 'master' into f20

 .gitignore                                         |    2 +
 graphite-web-0.9.10-fhs-thirdparty.patch           |  185 ---------------
 ...0.9.12-Amend-default-filesystem-locations.patch |   83 +++++++
 graphite-web-0.9.12-Changes-for-django-1.5.patch   |  176 ++++++++++++++
 ...-web-0.9.12-Disable-internal-log-rotation.patch |   53 +++++
 ...e-web-0.9.12-Fix-build-index.sh-variables.patch |   36 +++
 ...-web-0.9.12-Force-use-of-system-libraries.patch |  101 ++++++++
 graphite-web-0.9.12-carbonlink-exception-log.patch |   18 ++
 graphite-web-0.9.12-dashboard-load.patch           |   30 +++
 ...e-web-0.9.12-safe-unpickle-deque-addition.patch |   30 +++
 graphite-web-README.fedora                         |   15 +-
 graphite-web-README.selinux                        |    4 -
 graphite-web-logrotate.fedora                      |    8 -
 graphite-web-vhost.conf                            |   22 ++-
 graphite-web.logrotate                             |    9 +
 graphite-web.spec                                  |  240 ++++++++++++++------
 sources                                            |    2 +-
 17 files changed, 735 insertions(+), 279 deletions(-)
---