Commit 917e3a61 authored by Eibad Ali's avatar Eibad Ali

Merge branch 'master' into GAFP-4

# Conflicts:
#	local.settings.json
#	src/main/java/com/nisum/demo/blobStorage/BlobTriggerFunction.java
#	src/main/resources/application.properties
parents 29f9b069 ca8d081a
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
"FUNCTIONS_EXTENSION_VERSION": "~4", "FUNCTIONS_EXTENSION_VERSION": "~4",
"APPINSIGHTS_INSTRUMENTATIONKEY": "1add74d8-accb-402c-9aed-8bce4a21150e", "APPINSIGHTS_INSTRUMENTATIONKEY": "1add74d8-accb-402c-9aed-8bce4a21150e",
"APPLICATIONINSIGHTS_CONNECTION_STRING": "InstrumentationKey=1add74d8-accb-402c-9aed-8bce4a21150e;IngestionEndpoint=https://centralus-2.in.applicationinsights.azure.com/;LiveEndpoint=https://centralus.livediagnostics.monitor.azure.com/", "APPLICATIONINSIGHTS_CONNECTION_STRING": "InstrumentationKey=1add74d8-accb-402c-9aed-8bce4a21150e;IngestionEndpoint=https://centralus-2.in.applicationinsights.azure.com/;LiveEndpoint=https://centralus.livediagnostics.monitor.azure.com/",
"FUNCTIONS_WORKER_RUNTIME": "java" "FUNCTIONS_WORKER_RUNTIME": "java",
}, "AzureWebJobsStorage": "DefaultEndpointsProtocol=https;AccountName=clientbatchfiles;AccountKey=4A8bv/a0g2EcEiC2DDGtF275dkTK4Da4++OX0CcpFep0mgedNvhZkuBQObmDphWYPdy3VO/uKSvw+AStJEQAeg==;EndpointSuffix=core.windows.net"
"ConnectionStrings": {
"MyStorageConnectionAppSetting": "DefaultEndpointsProtocol=https;AccountName=clientbatchfiles;AccountKey=4A8bv/a0g2EcEiC2DDGtF275dkTK4Da4++OX0CcpFep0mgedNvhZkuBQObmDphWYPdy3VO/uKSvw+AStJEQAeg==;EndpointSuffix=core.windows.net"
}, },
"IsEncrypted": false "IsEncrypted": false
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment