alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/nasa/openmctweb into search

Browse Source 
Conflicts:
	platform/commonUI/general/src/controllers/TreeNodeController.js
	platform/persistence/elastic/src/ElasticSearchProvider.js
This commit is contained in:
slhale
2015-08-24 13:14:43 -07:00
parent 33a63947e5 f1ca9ff15e
commit c81e2dbb4a
277 changed files with 10693 additions and 9066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/persistence/elastic/bundle.json
View File

@@ -1,6 +1,6 @@
{
"name": "Couch Persistence",
"description": "Adapter to read and write objects using a CouchDB instance.",
"name": "ElasticSearch Persistence",
"description": "Adapter to read and write objects using an ElasticSearch instance.",
"extensions": {
"components": [
{