Skip to content

Commit bd3894c

Browse files
adamralphadamralph
committed
Merge branch 'release-4.0.0' into master
# Conflicts: # packaging/nuget/NServiceBus.RabbitMQ.nuspec # src/NServiceBus.RabbitMQ.AcceptanceTests/packages.config # src/NServiceBus.RabbitMQ.Tests/packages.config # src/NServiceBus.RabbitMQ/packages.config
2 parents 638bbda + 8cff57e commit bd3894c

File tree

471 files changed

+24669
-14449
lines changed

Some content is hidden

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

471 files changed

+24669
-14449
lines changed

‎.mailmap‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Andreas Öhlund <andreas.ohlund@particular.net> Andreas Öhlund <andreasohlund2@gmail.com>
2+
Andreas Öhlund <andreas.ohlund@particular.net> andreasohlund <andreasohlund2@gmail.com>
3+
Andreas Öhlund <andreas.ohlund@particular.net> andreasohlund <andreas.ohlund@particular.net>
4+
danielmarbach <daniel.marbach@particular.net> Daniel Marbach <daniel.marbach@particular.net>
5+
John Simons <john.simons@nservicebus.com> John Simons <john@thesimonshouse.com>
6+
Szymon Kulec <scooletz@gmail.com> Scooletz <scooletz@gmail.com>

‎Docker.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Docker
2+
## Getting ready
3+
1. Install [boot2docker](http://boot2docker.io/) for your operating system or install docker directly with your method of choice
4+
1. Open a shell which has docker in the path (under windows this is boot2docker start)
5+
initializing...
6+
Virtual machine boot2docker-vm already exists
7+
8+
starting...
9+
Waiting for VM and Docker daemon to start...
10+
................oooooooo
11+
Started.
12+
...
13+
14+
To connect the Docker client to the Docker daemon, please set:
15+
export ...
16+
17+
Or run: `eval "$(boot2docker shellinit)"`
18+
19+
IP address of docker VM:
20+
192.168.59.103
21+
note the IP address (in this example `192.168.59.103`) of the host.
22+
1. Change directory to the root folder of this repository and issue the following command
23+
docker build -t particular_rabbit
24+
1. When everything is successful start the rabbit like this
25+
docker run -d --hostname rabbit --name rabbit -p 5672:5672 -p 15672:15672 particular_rabbit
26+
1. You can then access rabbit by using the host IP address. If you want to access the management interface then open up a web browser on your machine and type in
27+
http://host-ip:15672
28+
29+
## Start rabbit again
30+
docker start rabbit
31+
32+
## Look at rabbit logs
33+
docker logs rabbit
34+
35+
## Rebuild from scratch or update
36+
docker stop rabbit
37+
docker rm rabbit
38+
repeat Step 3 and 4 from Getting ready

‎Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
FROM rabbitmq:3.5.4-management
2+
MAINTAINER Particular Software

‎GitVersion.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
assembly-versioning-scheme: Major
2-
2+
next-version: 4.0
33
branches:
44
develop:
5-
tag: alpha
5+
tag: alpha
6+
releases?[/-]:
7+
tag: rc

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ Before doing anything else, make sure you have RabbitMQ up and running in your e
1919
## Samples
2020

2121
See https://github.com/Particular/NServiceBus.RabbitMQ.Samples
22+
23+
## Maintainers
24+
The following team is responsible for this repository: @Particular/rabbitmq-transport-maintainers

‎buildsupport/GitVersionTask/NativeBinaries/amd64/git2-90befde.dll‎

-920 KB
Binary file not shown.

‎buildsupport/GitVersionTask/NativeBinaries/x86/git2-90befde.dll‎

-703 KB
Binary file not shown.

‎packaging/nuget/NServiceBus.RabbitMQ.nuspec‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
<id>NServiceBus.RabbitMQ</id>
55
<title>NServiceBus RabbitMQ</title>
66
<version>$version$</version>
7-
<authors>NServiceBus Ltd</authors>
8-
<owners>Udi Dahan, Andreas Ohlund, John Simons</owners>
9-
<licenseUrl>http://particular.net/LicenseAgreement</licenseUrl>
10-
<projectUrl>http://particular.net/</projectUrl>
11-
<iconUrl>http://s3.amazonaws.com/nuget.images/NServiceBus_32.png</iconUrl>
12-
<requireLicenseAcceptance>true</requireLicenseAcceptance>
7+
<authors>$authors$</authors>
8+
<owners>$owners$</owners>
9+
<licenseUrl>$licenseUrl$</licenseUrl>
10+
<projectUrl>$projectUrl$</projectUrl>
11+
<iconUrl>$iconUrl$</iconUrl>
12+
<requireLicenseAcceptance>$requireLicenseAcceptance$</requireLicenseAcceptance>
1313
<description>RabbitMQ support for NServicebus</description>
1414
<releaseNotes></releaseNotes>
15-
<copyright>Copyright 2010-2015 NServiceBus. All rights reserved</copyright>
15+
<copyright>$copyright$</copyright>
1616
<tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
1717
<dependencies>
18-
<dependency id="NServiceBus" version="[5.0.0, 6.0.0)" />
18+
<dependency id="NServiceBus" version="[6.0.0, 7.0.0)" />
1919
<dependency id="RabbitMQ.Client" version="[4.1.0, 4.2.0)" />
2020
</dependencies>
2121
</metadata>
2222
<files>
23-
<file src="..\..\binaries\NServiceBus.Transports.RabbitMQ.???" target="lib\net451" />
23+
<file src="..\..\binaries\NServiceBus.Transports.RabbitMQ.???" target="lib\net452" />
2424
</files>
25-
</package>
25+
</package>

‎src/NServiceBus.RabbitMQ.AcceptanceTests/App_Packages/NSB.AcceptanceTests.5.2.0/Audit/When_ForwardReceivedMessagesTo_is_set.cs‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎src/NServiceBus.RabbitMQ.AcceptanceTests/App_Packages/NSB.AcceptanceTests.5.2.0/Audit/When_using_audit_message_is_received.cs‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)