Skip to content

Commit 420d775

Browse files
authored
Merge pull request #159215 from MikeRayMSFT/revert-158977-release-build-2021-logic-apps
Revert "//Build - More preview label cleanup and other GA updates"
2 parents ec7526b + 9646230 commit 420d775

File tree

72 files changed

+603
-543
lines changed

Some content is hidden

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

72 files changed

+603
-543
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5028,6 +5028,11 @@
50285028
"redirect_url": "/azure/architecture/reference-architectures/dmz/secure-vnet-hybrid",
50295029
"redirect_document_id": false
50305030
},
5031+
{
5032+
"source_path_from_root": "/articles/logic-apps/parameterize-workflow-app.md",
5033+
"redirect_url": "/azure/logic-apps/",
5034+
"redirect_document_id": false
5035+
},
50315036
{
50325037
"source_path_from_root": "/articles/logic-apps/logic-apps-architectures-simple-enterprise-integration.md",
50335038
"redirect_url": "/azure/architecture/reference-architectures/enterprise-integration/basic-enterprise-integration",

articles/connectors/apis-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ An *action* is an operation that follows the trigger and performs some kind of t
4040

4141
## Connector categories
4242

43-
In Logic Apps, most triggers and actions are available in either a *built-in* version or *managed connector* version. A small number of triggers and actions are available in both versions. The versions available depend on whether you create a multi-tenant logic app or a single-tenant logic app, which is currently available only in [single-tenant Azure Logic Apps](../logic-apps/single-tenant-overview-compare.md).
43+
In Logic Apps, most triggers and actions are available in either a *built-in* version or *managed connector* version. A small number of triggers and actions are available in both versions. The versions available depend on whether you create a multi-tenant logic app or a single-tenant logic app, which is currently available only in [Logic Apps Preview](../logic-apps/single-tenant-overview-compare.md).
4444

4545
[Built-in triggers and actions](built-in.md) run natively on the Logic Apps runtime, don't require creating connections, and perform these kinds of tasks:
4646

articles/connectors/connectors-create-api-mq.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: ChristopherHouser
77
ms.author: chrishou
88
ms.reviewer: valthom, estfan, logicappspm
99
ms.topic: article
10-
ms.date: 05/25/2021
10+
ms.date: 04/26/2021
1111
tags: connectors
1212
---
1313

@@ -25,9 +25,11 @@ This connector includes a Microsoft MQ client that communicates with a remote MQ
2525

2626
## Available operations
2727

28-
* Multi-tenant Azure Logic Apps: When you create a **Logic App (Consumption)** resource, you can connect to an MQ server only by using the *managed* MQ connector. This connector provides only actions, no triggers.
28+
The IBM MQ connector provides actions but no triggers.
2929

30-
* Single-tenant Azure Logic Apps: When you create a single-tenant based logic app workflow, you can connect to an MQ server by using either the managed MQ connector, which includes *only* actions, or the *built-in* MQ operations, which includes triggers *and* actions.
30+
* Multi-tenant Azure Logic Apps: When you create a consumption-based logic app workflow, you can connect to an MQ server by using the *managed* MQ connector.
31+
32+
* Single-tenant Azure Logic Apps (preview): When you create a preview logic app workflow, you can connect to an MQ server by using either the managed MQ connector or the *built-in* MQ operations (preview).
3133

3234
For more information about the difference between a managed connector and built-in operations, review [key terms in Logic Apps](../logic-apps/logic-apps-overview.md#logic-app-concepts).
3335

@@ -42,14 +44,11 @@ The following list describes only some of the managed operations available for M
4244

4345
For all the managed connector operations and other technical information, such as properties, limits, and so on, review the [MQ connector's reference page](/connectors/mq/).
4446

45-
#### [Built-in](#tab/built-in)
47+
#### [Built-in (preview)](#tab/built-in)
4648

4749
The following list describes only some of the built-in operations available for MQ:
4850

49-
* When a message is available in a queue, take some action.
50-
* When one or more messages are received from a queue (auto-complete), take some action.
51-
* When one or more messages are received from a queue (peek-lock), take some action.
52-
* Receive a single message or an array of messages from a queue. For multiple messages, you can specify the maximum number of messages to return per batch and the maximum batch size in KB.
51+
* Receive a single message or an array of messages from the MQ server. For multiple messages, you can specify the maximum number of messages to return per batch and the maximum batch size in KB.
5352
* Send a single message or an array of messages to the MQ server.
5453

5554
These built-in MQ operations also have the following capabilities plus the benefits from all the other capabilities for logic apps in the [single-tenant Logic Apps service](../logic-apps/single-tenant-overview-compare.md):
@@ -122,7 +121,7 @@ When you add an MQ action for the first time, you're prompted to create a connec
122121

123122
1. When you're done, select **Create**.
124123

125-
#### [Built-in](#tab/built-in)
124+
#### [Built-in (preview)](#tab/built-in)
126125

127126
1. Provide the connection information for your MQ server.
128127

0 commit comments

Comments
 (0)