Merge "Rebase to collectd-ceilometer-plugin stable/mitaka 1. fix pbr:version_string...
authorGuo Ruijing <ruijing.guo@intel.com>
Wed, 10 Aug 2016 00:58:28 +0000 (00:58 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 10 Aug 2016 00:58:28 +0000 (00:58 +0000)
commitd19c4589554b2d82b6fcb1fe921ffeffd9377a2f
treeaba8d4f5cd5e90d0caa6a83129f95d95b092eb71
parentf8fe6cb863118896bfc157f56ca7185d866db6c0
parent5a072a6c6b097a9c3c54ea3f0656dfa5d8839182
Merge "Rebase to collectd-ceilometer-plugin stable/mitaka 1. fix pbr:version_string in collectd-ceilometer-plugin 2. disable collectd build to use stock collectd 3. update README in fuel plugin"