update: bumped ember to 3.2

sysdig-CLA-1.0-signed-off-by: Roberto Scolaro <[email protected]>

Signed-off-by: Roberto Scolaro <[email protected]>

Author: therealbobo

.eslintignore

@@ -1 +1,16 @@
-/blueprints/*/files/**/*.js
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+
+# misc
+/coverage/
+
+# ember-try
+/.node_modules.ember-try/

.gitignore

@@ -1,6 +1,7 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
+<<<<<<< HEAD
 /dist
 /tmp
 /out
@@ -25,4 +26,26 @@ ember-electron/resources*/sysdig/
 ember-electron/resources/capture-samples/
 
 # virtualenv
-/venv
+/venv
+=======
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage/
+/libpeerconnection.log
+/npm-debug.log*
+/testem.log
+/yarn-error.log
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
+>>>>>>> d31eb24 (v3.1.4...v3.2.0)

config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.1.4",
+      "version": "3.2.0",
       "blueprints": [
         {
           "name": "app",