Skip to content

Commit 8fa608c

Browse files
author
Simon MacMullen
committed
Merge bug24606
2 parents f0da4b1 + 563b8a0 commit 8fa608c

File tree

259 files changed

+543
-542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

259 files changed

+543
-542
lines changed

LICENSE-MPL-RabbitMQ

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ EXHIBIT A -Mozilla Public License.
447447
The Original Code is RabbitMQ.
448448

449449
The Initial Developer of the Original Code is VMware, Inc.
450-
Copyright (c) 2007-2011 VMware, Inc. All rights reserved.''
450+
Copyright (c) 2007-2012 VMware, Inc. All rights reserved.''
451451

452452
[NOTE: The text of this Exhibit A may differ slightly from the text of
453453
the notices in the Source Code files of the Original Code. You should

dist-lib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
## The APL v2.0:
77
##
88
##---------------------------------------------------------------------------
9-
## Copyright (C) 2007-2011 VMware, Inc.
9+
## Copyright (C) 2007-2012 VMware, Inc.
1010
##
1111
## Licensed under the Apache License, Version 2.0 (the "License");
1212
## you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
3737
## The Original Code is RabbitMQ.
3838
##
3939
## The Initial Developer of the Original Code is VMware, Inc.
40-
## Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
40+
## Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
4141
##---------------------------------------------------------------------------
4242

4343
function assembly-version {

dist-msi.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
## The APL v2.0:
77
##
88
##---------------------------------------------------------------------------
9-
## Copyright (C) 2007-2011 VMware, Inc.
9+
## Copyright (C) 2007-2012 VMware, Inc.
1010
##
1111
## Licensed under the Apache License, Version 2.0 (the "License");
1212
## you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
3737
## The Original Code is RabbitMQ.
3838
##
3939
## The Initial Developer of the Original Code is VMware, Inc.
40-
## Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
40+
## Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
4141
##---------------------------------------------------------------------------
4242

4343
### Fail on any non-zero return

dist.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
## The APL v2.0:
77
##
88
##---------------------------------------------------------------------------
9-
## Copyright (C) 2007-2011 VMware, Inc.
9+
## Copyright (C) 2007-2012 VMware, Inc.
1010
##
1111
## Licensed under the Apache License, Version 2.0 (the "License");
1212
## you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
3737
## The Original Code is RabbitMQ.
3838
##
3939
## The Initial Developer of the Original Code is VMware, Inc.
40-
## Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
40+
## Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
4141
##---------------------------------------------------------------------------
4242

4343
### Fail on any non-zero return

docs/api-title-page.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<h1>RabbitMQ .NET client library API guide</h1>
77
<h2>Copyright</h2>
88
<p>
9-
This documentation is copyright (C) 2007-2011 VMware, Inc.
9+
This documentation is copyright (C) 2007-2012 VMware, Inc.
1010
</p>
1111
<h2>License</h2>
1212
<p>
@@ -18,7 +18,7 @@ <h2>License</h2>
1818
</p>
1919
<blockquote>
2020
<p>
21-
Copyright (C) 2007-2011 VMware, Inc.
21+
Copyright (C) 2007-2012 VMware, Inc.
2222
</p>
2323
<p>
2424
Licensed under the Apache License, Version 2.0 (the "License");
@@ -57,7 +57,7 @@ <h2>License</h2>
5757
</p>
5858
<p>
5959
The Initial Developer of the Original Code is VMware, Inc.
60-
Copyright (c) 2007-2011 VMware, Inc. All Rights Reserved.
60+
Copyright (c) 2007-2012 VMware, Inc. All Rights Reserved.
6161
</p>
6262
</blockquote>
6363
</body>

docs/extractdocbook.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
## The Original Code is RabbitMQ.
1212
##
1313
## The Initial Developer of the Original Code is VMware, Inc.
14-
## Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
14+
## Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
1515
##
1616

1717
from __future__ import nested_scopes

docs/user-guide-skeleton.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<year>2009</year>
1111
<year>2010</year>
1212
<year>2011</year>
13+
<year>2012</year>
1314
<holder> VMware, Inc.</holder>
1415
</copyright>
1516
<legalnotice>
@@ -22,7 +23,7 @@
2223
</para>
2324
<blockquote>
2425
<para>
25-
Copyright (C) 2007-2011 VMware, Inc.
26+
Copyright (C) 2007-2012 VMware, Inc.
2627
</para>
2728
<para>
2829
Licensed under the Apache License, Version 2.0 (the "License");
@@ -61,7 +62,7 @@
6162
</para>
6263
<para>
6364
The Initial Developer of the Original Code is VMware, Inc.
64-
Copyright (c) 2007-2011 VMware, Inc. All Rights Reserved.
65+
Copyright (c) 2007-2012 VMware, Inc. All Rights Reserved.
6566
</para>
6667
</blockquote>
6768

projects/client/Apigen/properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// The APL v2.0:
55
//
66
//---------------------------------------------------------------------------
7-
// Copyright (C) 2007-2011 VMware, Inc.
7+
// Copyright (C) 2007-2012 VMware, Inc.
88
//
99
// Licensed under the Apache License, Version 2.0 (the "License");
1010
// you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
3535
// The Original Code is RabbitMQ.
3636
//
3737
// The Initial Developer of the Original Code is VMware, Inc.
38-
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
38+
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
3939
//---------------------------------------------------------------------------
4040

4141
using System.Reflection;
@@ -50,7 +50,7 @@
5050
[assembly: AssemblyConfiguration("")]
5151
[assembly: AssemblyCompany("VMware, Inc.")]
5252
[assembly: AssemblyProduct("ApiGen")]
53-
[assembly: AssemblyCopyright("Copyright © 2007-2011 VMware, Inc.")]
53+
[assembly: AssemblyCopyright("Copyright © 2007-2012 VMware, Inc.")]
5454
[assembly: AssemblyTrademark("")]
5555
[assembly: AssemblyCulture("")]
5656

projects/client/Apigen/src/apigen/AmqpClass.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// The APL v2.0:
55
//
66
//---------------------------------------------------------------------------
7-
// Copyright (C) 2007-2011 VMware, Inc.
7+
// Copyright (C) 2007-2012 VMware, Inc.
88
//
99
// Licensed under the Apache License, Version 2.0 (the "License");
1010
// you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
3535
// The Original Code is RabbitMQ.
3636
//
3737
// The Initial Developer of the Original Code is VMware, Inc.
38-
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
38+
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
3939
//---------------------------------------------------------------------------
4040

4141
using System;

projects/client/Apigen/src/apigen/AmqpEntity.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// The APL v2.0:
55
//
66
//---------------------------------------------------------------------------
7-
// Copyright (C) 2007-2011 VMware, Inc.
7+
// Copyright (C) 2007-2012 VMware, Inc.
88
//
99
// Licensed under the Apache License, Version 2.0 (the "License");
1010
// you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
3535
// The Original Code is RabbitMQ.
3636
//
3737
// The Initial Developer of the Original Code is VMware, Inc.
38-
// Copyright (c) 2007-2011 VMware, Inc. All rights reserved.
38+
// Copyright (c) 2007-2012 VMware, Inc. All rights reserved.
3939
//---------------------------------------------------------------------------
4040

4141
using System;

0 commit comments

Comments
 (0)