Skip to content

Commit

Permalink
Merge pull request #18 from Notastica/move-module-to-root
Browse files Browse the repository at this point in the history
Move module to root
  • Loading branch information
Panthro committed Aug 15, 2016
2 parents afaf722 + 613cd8b commit a4175e7
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "data-feed-orchestrator",
"version": "0.0.2",
"version": "0.0.3",
"description": "A data feed orchestrator",
"bin": "cli.js",
"main": "lib/index.js",
Expand Down
4 changes: 2 additions & 2 deletions src/model/module.js → src/module.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import uuid from 'node-uuid';
import names from 'docker-names';
import assert from 'assert';
import * as mq from '../mq/connection';
import * as mq from './mq/connection';
import Promise from 'bluebird';
import logger from '../logging/logger';
import logger from './logging/logger';
import _ from 'lodash';
import EventEmitter from 'events';

Expand Down
2 changes: 1 addition & 1 deletion src/orchestrator.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Loki from 'lokijs';
import logger from './logging/logger';
import Module from './model/module';
import Module from './module';
import jsonpath from 'jsonpath';
import dockerNames from 'docker-names';
import * as mq from './mq/connection';
Expand Down
2 changes: 1 addition & 1 deletion test/module.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as chai from 'chai';
import dirtyChai from 'dirty-chai';
import Module from '../src/model/module';
import Module from '../src/module';
import dockerNames from 'docker-names';

// TEST SETUP
Expand Down
2 changes: 1 addition & 1 deletion test/orchestrator.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as chai from 'chai';
import dirtyChai from 'dirty-chai';
import Orchestrator from '../src/orchestrator';
import uuid from 'node-uuid';
import Module from '../src/model/module';
import Module from '../src/module';
import dockerNames from 'docker-names';


Expand Down

0 comments on commit a4175e7

Please sign in to comment.