slhale c81e2dbb4a Merge branch 'master' of https://github.com/nasa/openmctweb into search
Conflicts:
	platform/commonUI/general/src/controllers/TreeNodeController.js
	platform/persistence/elastic/src/ElasticSearchProvider.js
2015-08-24 13:14:43 -07:00
..
2015-08-04 13:04:52 -07:00
2015-03-19 16:48:04 -07:00

This bundle implements a connection to an external ElasticSearch persistence store in Open MCT Web.