[python-carbon/f20: 29/29] Merge branch 'master' into f20

[Jamie Nguyen]

commit d524d08d9c87b46281d7792ced638cc18029cb4a
Merge: 247b3b1 4448f32
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Fri Nov 14 18:43:22 2014 +0000

    Merge branch 'master' into f20

 .gitignore                                         |    2 +
 carbon-aggregator.1                                |   56 ++++
 carbon-aggregator.service                          |   14 +
 carbon-cache.1                                     |   50 ++++
 carbon-cache.service                               |   14 +
 carbon-client.1                                    |   43 +++
 carbon-relay.1                                     |   51 ++++
 carbon-relay.service                               |   14 +
 python-carbon-0.9.10-fedora.patch                  |   79 -----
 ...n-0.9.12-Fix-path-to-storage-schemas.conf.patch |   25 ++
 python-carbon-0.9.12-Set-sane-defaults.patch       |   38 +++
 python-carbon.logrotate                            |   10 +
 python-carbon.spec                                 |  302 +++++++++++++++-----
 sources                                            |    2 +-
 validate-storage-schemas.1                         |   17 ++
 15 files changed, 566 insertions(+), 151 deletions(-)
---