Skip to content

Commit d8b5392

Browse files
michaelklishinmichaelklishin
committed
merge stable into default
2 parents e39f1ee + 67643cd commit d8b5392

File tree

271 files changed

+510
-365
lines changed

Some content is hidden

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

271 files changed

+510
-365
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 GoPivotal, Inc.
450-
Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved.''
450+
Copyright (c) 2007-2014 GoPivotal, 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
## The Original Code is RabbitMQ.
3838
##
3939
## The Initial Developer of the Original Code is GoPivotal, Inc.
40-
## Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved.
40+
## Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved.
4141
##---------------------------------------------------------------------------
4242

4343
function assembly-version {

‎dist-msi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
## The Original Code is RabbitMQ.
3838
##
3939
## The Initial Developer of the Original Code is GoPivotal, Inc.
40-
## Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved.
40+
## Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved.
4141
##---------------------------------------------------------------------------
4242

4343
### Fail on any non-zero return

‎dist.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
## The Original Code is RabbitMQ.
3838
##
3939
## The Initial Developer of the Original Code is GoPivotal, Inc.
40-
## Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved.
40+
## Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved.
4141
##---------------------------------------------------------------------------
4242

4343
### Fail on any non-zero return

‎docs/api-title-page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ <h2>License</h2>
5757
</p>
5858
<p>
5959
The Initial Developer of the Original Code is GoPivotal, Inc.
60-
Copyright (c) 2007-2013 GoPivotal, Inc. All Rights Reserved.
60+
Copyright (c) 2007-2014 GoPivotal, 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 GoPivotal, Inc.
14-
## Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved.
14+
## Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved.
1515
##
1616

1717
from __future__ import nested_scopes

‎docs/user-guide-skeleton.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</para>
6464
<para>
6565
The Initial Developer of the Original Code is GoPivotal, Inc.
66-
Copyright (c) 2007-2013 GoPivotal, Inc. All Rights Reserved.
66+
Copyright (c) 2007-2014 GoPivotal, Inc. All Rights Reserved.
6767
</para>
6868
</blockquote>
6969

‎projects/client/Apigen/properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
// The Original Code is RabbitMQ.
3636
//
3737
// The Initial Developer of the Original Code is GoPivotal, Inc.
38-
// Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved.
38+
// Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved.
3939
//---------------------------------------------------------------------------
4040

4141
using System.Reflection;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
// The Original Code is RabbitMQ.
3636
//
3737
// The Initial Developer of the Original Code is GoPivotal, Inc.
38-
// Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved.
38+
// Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved.
3939
//---------------------------------------------------------------------------
4040

4141
using System;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
// The Original Code is RabbitMQ.
3636
//
3737
// The Initial Developer of the Original Code is GoPivotal, Inc.
38-
// Copyright (c) 2007-2013 GoPivotal, Inc. All rights reserved.
38+
// Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved.
3939
//---------------------------------------------------------------------------
4040

4141
using System;

0 commit comments

Comments
 (0)