Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ gem 'httpclient'
gem 'json-diff'
gem 'json-schema'
gem 'loggregator_emitter', '~> 5.0'
gem 'membrane', '~> 1.0'
gem 'mime-types', '~> 3.7'
gem 'multipart-parser'
gem 'netaddr', '>= 2.0.4'
Expand Down
2 changes: 0 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ GEM
machinist (1.0.6)
mcp (0.7.1)
json-schema (>= 4.1)
membrane (1.1.0)
method_source (1.1.0)
mime-types (3.7.0)
logger
Expand Down Expand Up @@ -656,7 +655,6 @@ DEPENDENCIES
listen
loggregator_emitter (~> 5.0)
machinist (~> 1.0.6)
membrane (~> 1.0)
mime-types (~> 3.7)
mock_redis
multipart-parser
Expand Down
8 changes: 8 additions & 0 deletions lib/membrane.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Vendored Membrane library - inlined from https://github.com/cloudfoundry/membrane
# This shim makes `require "membrane"` load the vendored code from lib/membrane/
# Original upstream: cloudfoundry/membrane (Apache 2.0 licensed)

require 'membrane/errors'
require 'membrane/schemas'
require 'membrane/schema_parser'
require 'membrane/version'
325 changes: 325 additions & 0 deletions lib/membrane/LICENSE

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions lib/membrane/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
cf-membrane

Copyright (c) 2013 Pivotal Software Inc. All Rights Reserved.

This product is licensed to you under the Apache License, Version 2.0 (the "License").
You may not use this product except in compliance with the License.

This product may include a number of subcomponents with separate copyright notices
and license terms. Your use of these subcomponents is subject to the terms and
conditions of the subcomponent's license, as noted in the LICENSE file.
Loading