Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo

Conflicts:
	cookbooks/wt_streamingapi/metadata.rb
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo

Conflicts:
	environments/heatmap-staging.json
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo

Conflicts:
	environments/heatmap-staging.json
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo

Conflicts:
	environments/heatmap-staging.json
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Merge branch 'chef-vendor-yum'
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo