Bug 1033858 - Update marionette-js-runner for bump to marionette-js-l…

…ogger
mozilla-b2g · Jul 11, 2014 · 78bf804 · 78bf804
1 parent 2d98908
commit 78bf804
Show file tree

Hide file tree

Showing 36 changed files with 451 additions and 105 deletions.
diff --git a/node_modules/marionette-js-runner/node_modules/marionette-js-logger/.travis.yml b/node_modules/marionette-js-runner/node_modules/marionette-js-logger/.travis.yml
diff --git a/node_modules/marionette-js-runner/node_modules/marionette-js-logger/Makefile b/node_modules/marionette-js-runner/node_modules/marionette-js-logger/Makefile
diff --git a/node_modules/marionette-js-runner/node_modules/marionette-js-logger/README.md b/node_modules/marionette-js-runner/node_modules/marionette-js-logger/README.md
diff --git a/node_modules/marionette-js-runner/node_modules/marionette-js-logger/lib/client.js b/node_modules/marionette-js-runner/node_modules/marionette-js-logger/lib/client.js
diff --git a/node_modules/marionette-js-runner/node_modules/marionette-js-logger/lib/server.js b/node_modules/marionette-js-runner/node_modules/marionette-js-logger/lib/server.js
diff --git a/...modules/non-native-websocket/CHANGELOG.md → ...ogger/node_modules/websocket/CHANGELOG.md b/...modules/non-native-websocket/CHANGELOG.md → ...ogger/node_modules/websocket/CHANGELOG.md
diff --git a/...node_modules/non-native-websocket/LICENSE → ...-js-logger/node_modules/websocket/LICENSE b/...node_modules/non-native-websocket/LICENSE → ...-js-logger/node_modules/websocket/LICENSE
diff --git a/...ode_modules/non-native-websocket/Makefile → ...js-logger/node_modules/websocket/Makefile b/...ode_modules/non-native-websocket/Makefile → ...js-logger/node_modules/websocket/Makefile
diff --git a/...de_modules/non-native-websocket/README.md → ...s-logger/node_modules/websocket/README.md b/...de_modules/non-native-websocket/README.md → ...s-logger/node_modules/websocket/README.md
diff --git a/...marionette-js-runner/node_modules/marionette-js-logger/node_modules/websocket/binding.gyp b/...marionette-js-runner/node_modules/marionette-js-logger/node_modules/websocket/binding.gyp
diff --git a/...ode_modules/non-native-websocket/index.js → ...js-logger/node_modules/websocket/index.js b/...ode_modules/non-native-websocket/index.js → ...js-logger/node_modules/websocket/index.js
diff --git a/.../marionette-js-runner/node_modules/marionette-js-logger/node_modules/websocket/install.js b/.../marionette-js-runner/node_modules/marionette-js-logger/node_modules/websocket/install.js
diff --git a/...les/non-native-websocket/lib/Constants.js → ...r/node_modules/websocket/lib/Constants.js b/...les/non-native-websocket/lib/Constants.js → ...r/node_modules/websocket/lib/Constants.js
diff --git a/...s/non-native-websocket/lib/Deprecation.js → ...node_modules/websocket/lib/Deprecation.js b/...s/non-native-websocket/lib/Deprecation.js → ...node_modules/websocket/lib/Deprecation.js
diff --git a/...tive-websocket/lib/Validation.fallback.js → ...ules/websocket/lib/Validation.fallback.js b/...tive-websocket/lib/Validation.fallback.js → ...ules/websocket/lib/Validation.fallback.js
diff --git a/...es/non-native-websocket/lib/Validation.js → .../node_modules/websocket/lib/Validation.js b/...es/non-native-websocket/lib/Validation.js → .../node_modules/websocket/lib/Validation.js
diff --git a/...n-native-websocket/lib/WebSocketClient.js → ..._modules/websocket/lib/WebSocketClient.js b/...n-native-websocket/lib/WebSocketClient.js → ..._modules/websocket/lib/WebSocketClient.js
diff --git a/...tive-websocket/lib/WebSocketConnection.js → ...ules/websocket/lib/WebSocketConnection.js b/...tive-websocket/lib/WebSocketConnection.js → ...ules/websocket/lib/WebSocketConnection.js
diff --git a/...on-native-websocket/lib/WebSocketFrame.js → ...e_modules/websocket/lib/WebSocketFrame.js b/...on-native-websocket/lib/WebSocketFrame.js → ...e_modules/websocket/lib/WebSocketFrame.js
diff --git a/...-native-websocket/lib/WebSocketRequest.js → ...modules/websocket/lib/WebSocketRequest.js b/...-native-websocket/lib/WebSocketRequest.js → ...modules/websocket/lib/WebSocketRequest.js
diff --git a/...n-native-websocket/lib/WebSocketRouter.js → ..._modules/websocket/lib/WebSocketRouter.js b/...n-native-websocket/lib/WebSocketRouter.js → ..._modules/websocket/lib/WebSocketRouter.js
diff --git a/...e-websocket/lib/WebSocketRouterRequest.js → ...s/websocket/lib/WebSocketRouterRequest.js b/...e-websocket/lib/WebSocketRouterRequest.js → ...s/websocket/lib/WebSocketRouterRequest.js
diff --git a/...n-native-websocket/lib/WebSocketServer.js → ..._modules/websocket/lib/WebSocketServer.js b/...n-native-websocket/lib/WebSocketServer.js → ..._modules/websocket/lib/WebSocketServer.js
diff --git a/...modules/non-native-websocket/lib/utils.js → ...ogger/node_modules/websocket/lib/utils.js b/...modules/non-native-websocket/lib/utils.js → ...ogger/node_modules/websocket/lib/utils.js
diff --git a/...les/non-native-websocket/lib/websocket.js → ...r/node_modules/websocket/lib/websocket.js b/...les/non-native-websocket/lib/websocket.js → ...r/node_modules/websocket/lib/websocket.js
diff --git a/.../non-native-websocket/lib/xor.fallback.js → ...ode_modules/websocket/lib/xor.fallback.js b/.../non-native-websocket/lib/xor.fallback.js → ...ode_modules/websocket/lib/xor.fallback.js
diff --git a/...e_modules/non-native-websocket/lib/xor.js → ...-logger/node_modules/websocket/lib/xor.js b/...e_modules/non-native-websocket/lib/xor.js → ...-logger/node_modules/websocket/lib/xor.js