Merge branch 'release-1.0.0'

Particular · Apr 15, 2014 · 33bb355 · 33bb355
2 parents 3804b33 + 0b31c46
commit 33bb355
Show file tree

Hide file tree

Showing 442 changed files with 18,490 additions and 4,571 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
-build
+nugets
 build32
 binaries
 obj
 bin
+*.vshost.*
 .nu
 _ReSharper.*
 _UpgradeReport.*
@@ -14,6 +15,7 @@ _UpgradeReport.*
 *~
 *.swp
 *.user
+TestResults
 TestResult.xml
 results
 CommonAssemblyInfo.cs
@@ -27,3 +29,10 @@ Release
 Artifacts
 LogFiles
 csx
+*.ncrunchproject
+*.ncrunchsolution
+_NCrunch_NServiceBus/*
+logs
+run-git.cmd
+src/Chocolatey/Build/*
+App_Packages
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
diff --git a/MergeModule/ManagementAPI.aip b/MergeModule/ManagementAPI.aip
diff --git a/MergeModule/res-binary/Particular.CustomActions.CA.dll b/MergeModule/res-binary/Particular.CustomActions.CA.dll
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-ServiceBus.Management
+ServiceControl
 =====================
 
-Management extension to ServiceBus
+Management extension to ServiceBus