[DEPENDENCY]: upgraded to ember-cli@2.10

.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "ember-redux",
   "dependencies": {
-    "ember": "~2.9.0",
+    "ember": "~2.10.0",
     "ember-cli-shims": "0.1.3",
     "fauxjax-toranb": "1.9.0",
     "jquery": "~2.1.4"

package.json

@@ -27,15 +27,15 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
     "ember-browserify": "^1.1.11",
-    "ember-cli": "2.9.1",
+    "ember-cli": "2.10.0",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-htmlbars": "^1.0.10",
     "ember-cli-htmlbars-inline-precompile": "^0.3.3",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-jshint": "^1.0.4",
+    "ember-cli-jshint": "^2.0.1",
     "ember-cli-qunit": "^3.0.1",
-    "ember-cli-release": "0.2.9",
+    "ember-cli-release": "^0.2.9",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",

tests/helpers/start-app.js

@@ -27,8 +27,8 @@ Ember.Test.registerAsyncHelper('ajax', ajax);
 export default function startApp(attrs) {
   let application;
 
-  let attributes = Ember.merge({}, config.APP);
-  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+  // use defaults, but you can override
+  let attributes = Ember.assign({}, config.APP, attrs);
 
   Ember.run(() => {
     application = Application.create(attributes);