Clean up another merge conflict Lei found in testing.

vt0r · vt0r · commit 51ff87c44b19 · 2018-10-12T15:43:18.000-04:00
diff --git a/cookbooks/bcpc-hadoop/attributes/hbase.rb b/cookbooks/bcpc-hadoop/attributes/hbase.rb
@@ -116,12 +116,6 @@
   }
 }
 
-default['bcpc']['bach_web']['conn_lib']['hbase_conn_lib_blacklist'] = []
-default['bcpc']['bach_web']['files']['hbase_conn_lib_blacklist'] = {
-  'desc' => 'HBase conn lib blacklist file',
-  'path' => 'files/hbase/blacklist.conf'
-}
-
 # haproxy
 default['bcpc']['haproxy']['ha_services'] += [{
   'name' => 'hbase_master',

Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,6 @@`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`119`		`-default['bcpc']['bach_web']['conn_lib']['hbase_conn_lib_blacklist'] = []`
`120`		`-default['bcpc']['bach_web']['files']['hbase_conn_lib_blacklist'] = {`
`121`		`- 'desc' => 'HBase conn lib blacklist file',`
`122`		`- 'path' => 'files/hbase/blacklist.conf'`
`123`		`-}`
`124`		`-`
`125`	`119`	`# haproxy`
`126`	`120`	`default['bcpc']['haproxy']['ha_services'] += [{`
`127`	`121`	`'name' => 'hbase_master',`