Skip to content

Commit 4ff7f26

Browse files
authored
Merge branch 'master' into release-3.3.0
2 parents 72abfff + d9bca06 commit 4ff7f26

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/ResourceManager/Network/ChangeLog.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@
3232
    - Fixed issue where UseRemoteGateway property was not being populated in the request to the server
3333
* Get-AzureRmEffectiveNetworkSecurityGroup
3434
    - Add warning if there is no response from GetEffectiveNSG
35-
* Add Source property to EffectiveRoute
36-
35+
* Add Source property to EffectiveRoute

src/ResourceManager/Network/Commands.Network.Test/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@
3434

3535
[assembly: AssemblyVersion("3.3.0")]
3636
[assembly: AssemblyFileVersion("3.3.0")]
37-
[assembly: CollectionBehavior(DisableTestParallelization = true)]
37+
[assembly: CollectionBehavior(DisableTestParallelization = true)]

src/ResourceManager/Network/Commands.Network/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@
3131
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Network.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
3232
#else
3333
[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Network.Test")]
34-
#endif
34+
#endif

0 commit comments

Comments
 (0)