Allow arbitrary tags to be set in sysconfig
Merge branch 'master' of /git/shared/home/git/repositories/kieren.hynd/tcollector
Clean out .pyc files on startup
Don't meminfo to bytes or track cpu scaling yet
if/else shorthand and startswith(tuple) are 2.5+

And we're largely using Python 2.4 :(
Merge branch 'master' of /git/shared/home/git/repositories/kieren.hynd/tcollector
Move hbase and hadoop to http /jmx collection

* remove the old java jars
* Create an http base class for hadoop metrics2
* Create hadoop namenode and datanode subclasses
* create hbase master and regionserver subclasses
* refactor some functions into utils.

Signed-off-by: Benoit Sigoure <tsunanet@gmail.com>
Try to fallback to ordereddict for Python < 2.7
Properly handle the json module being missing.
netstat.py: handle multiple sets of data for the same data type, e.g. IcmpMsg.

Signed-off-by: Vasiliy Kiryanov <vasiliy.kiryanov@gmail.com>
Refactor the way adding default tags works, so for any line, it will add the tags if they're not already present. This allows for defaults that can be overridden in a collector.
Merge upstream and remote-tracking branch 'remotes/mikebryant/fix-duplicate-tags'
Refactor the way adding default tags works, so for any line, it will add the tags if they're not already present. This allows for defaults that can be overridden in a collector.
Merge remote-tracking branch 'mikebryant/fix-duplicate-tags' into tagfix
Revert default loglevel to INFO (changed to DEBUG in 8bb22d63)
Merge branch 'info_logging'
Reverting default loglevel to INFO