Skip to content

Commit

Permalink
Merge branch 'master' of github.com:tangxuehua/equeue
Browse files Browse the repository at this point in the history
Conflicts:
	src/EQueue/Clients/Producers/Producer.cs
	src/Samples/QuickStart/QuickStart.ProducerClient/app.config
  • Loading branch information
tangxuehua committed Jun 20, 2015
2 parents 913c110 + 97058f7 commit 8e38e1d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static void Main(string[] args)
}
else
{
_logger.Error("Sent message timeout.");
_logger.ErrorFormat("Sent message failed, errorMessage: {0}", sendTask.Result.ErrorMessage);
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
<appSettings>
<add key="MessageCount" value="500000"/>
<add key="MessageSize" value="512"/>
<add key="MessageSize" value="128"/>
<add key="BrokerAddress" value=""/>
</appSettings>
</configuration>

0 comments on commit 8e38e1d

Please sign in to comment.