typo in url for portadm
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
add wt_actioncenter_ui to streaming auth databag (test)
typo
Bumping builds for wapi bridge work
upping timeout value

Conflicts:
	data_bags/nagios_services/linux_system_updates.json
upping nagios plugin timeouts

Conflicts:
	data_bags/nagios_services/linux_system_updates.json
updating wapi build
updating nagios databag items to support granular alerting
Updated edgeservice, storm, sproc, sapi, and thumbnail on B
Merge branch 'master' of http://git/git/chef-repo
fixed syntax error extra comma
removing mcnamaras.json
Bumped SAPi cookbook version
Merge branch 'master' of http://git.webtrends.corp/git/chef-repo
Updated sapi cookbook to 1.2.7 for B pod
Merge branch 'master' of http://git/git/chef-repo
Merge branch 'chef-vendor-runit'

Conflicts:
	cookbooks/runit/CHANGELOG.md
	cookbooks/runit/libraries/resource_runit_service.rb
	cookbooks/runit/metadata.json
	cookbooks/runit/metadata.rb
Bumped SAPI version
Add role wt_actioncenter_ui