Upgrading elasticsearch from 1.7.3 to 2.1.1

[warkolm (Mark Walkom)]

@trekr5

have discovered that the default location for the elasticsearch.yml file (config file) has been changed from /etc/elasticsearch to /usr/share/elasticsearch/bin

Nope, it hasn't, it's still /etc/elasticsearch.