Switching to use Hadoop 2.2.0 and a separate Hive server