diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-03-22 19:01:46 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-03-22 19:01:46 +0000 |
| commit | 6d99ff5915a8b8c9193632cba843ad659e919b6e (patch) | |
| tree | 7c105758dd81fa68912763e141576eb7a5863f1f | |
| parent | d37f1a657fb76b275e76397143f775b8113d79c1 (diff) | |
| parent | 5a4a5d7be9c56f6ff929a0ffe11a942e3a2708c3 (diff) | |
| download | rabbitmq-codegen-6d99ff5915a8b8c9193632cba843ad659e919b6e.tar.gz | |
merge bug23749 into default
| -rw-r--r-- | LICENSE-MPL-RabbitMQ | 2 | ||||
| -rw-r--r-- | amqp-rabbitmq-0.8.json | 2 | ||||
| -rw-r--r-- | amqp-rabbitmq-0.9.1.json | 2 | ||||
| -rw-r--r-- | amqp_codegen.py | 4 | ||||
| -rw-r--r-- | demo_extension.json | 2 | ||||
| -rw-r--r-- | license_info | 4 |
6 files changed, 10 insertions, 6 deletions
diff --git a/LICENSE-MPL-RabbitMQ b/LICENSE-MPL-RabbitMQ index 14bcc21..4cdf783 100644 --- a/LICENSE-MPL-RabbitMQ +++ b/LICENSE-MPL-RabbitMQ @@ -447,7 +447,7 @@ EXHIBIT A -Mozilla Public License. The Original Code is RabbitMQ. The Initial Developer of the Original Code is VMware, Inc. - Copyright (c) 2007-2011 VMware, Inc. All rights reserved.'' + Copyright (c) 2007-2013 VMware, Inc. All rights reserved.'' [NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should diff --git a/amqp-rabbitmq-0.8.json b/amqp-rabbitmq-0.8.json index bb77302..e93dc1a 100644 --- a/amqp-rabbitmq-0.8.json +++ b/amqp-rabbitmq-0.8.json @@ -4,7 +4,7 @@ "minor-version": 0, "port": 5672, "copyright": [ - "Copyright (C) 2008-2011 VMware, Inc.\n", + "Copyright (C) 2008-2013 VMware, Inc.\n", "\n", "Permission is hereby granted, free of charge, to any person\n", "obtaining a copy of this file (the \"Software\"), to deal in the\n", diff --git a/amqp-rabbitmq-0.9.1.json b/amqp-rabbitmq-0.9.1.json index ac9eb32..ddb0fa6 100644 --- a/amqp-rabbitmq-0.9.1.json +++ b/amqp-rabbitmq-0.9.1.json @@ -5,7 +5,7 @@ "revision": 1, "port": 5672, "copyright": [ - "Copyright (C) 2008-2011 VMware, Inc.\n", + "Copyright (C) 2008-2013 VMware, Inc.\n", "\n", "Permission is hereby granted, free of charge, to any person\n", "obtaining a copy of this file (the \"Software\"), to deal in the\n", diff --git a/amqp_codegen.py b/amqp_codegen.py index 026715d..61e2596 100644 --- a/amqp_codegen.py +++ b/amqp_codegen.py @@ -11,7 +11,7 @@ ## The Original Code is RabbitMQ. ## ## The Initial Developer of the Original Code is VMware, Inc. -## Copyright (c) 2007-2011 VMware, Inc. All rights reserved. +## Copyright (c) 2007-2013 VMware, Inc. All rights reserved. ## from __future__ import nested_scopes @@ -119,7 +119,7 @@ mergers = { } def merge_load_specs(filenames, ignore_conflicts): - handles = [file(filename) for filename in filenames] + handles = [open(filename) for filename in filenames] docs = [json.load(handle) for handle in handles] spec = {} for doc in docs: diff --git a/demo_extension.json b/demo_extension.json index 049ad7b..26eb322 100644 --- a/demo_extension.json +++ b/demo_extension.json @@ -2,7 +2,7 @@ "extension": { "name": "demo", "version": "1.0", - "copyright": "Copyright (C) 2009-2011 VMware, Inc." + "copyright": "Copyright (C) 2009-2013 VMware, Inc." }, "domains": [ ["foo-domain", "shortstr"] diff --git a/license_info b/license_info new file mode 100644 index 0000000..d7dffcc --- /dev/null +++ b/license_info @@ -0,0 +1,4 @@ +The files amqp-rabbitmq-0.8.json and amqp-rabbitmq-0.9.1.json are +"Copyright (C) 2008-2013 VMware", Inc. and are covered by the MIT +license. + |