alicejw 2bcfb4a1a3 fix merge conflict ...

Signed-off-by: alicejw <alicejw@amazon.com>

2022-05-18 11:16:11 -07:00

..

cat-aliases.md

Add "introduced" labels for APIs

2021-07-26 16:14:22 -07:00

cat-allocation.md

update old sample names to 'opensearch' instead of 'odfe

2022-05-16 11:26:21 -07:00

cat-cluster_manager.md

resolve conflicts

2022-05-18 11:08:41 -07:00

cat-count.md

Add "introduced" labels for APIs

2021-07-26 16:14:22 -07:00

cat-field-data.md

update old sample names to 'opensearch' instead of 'odfe

2022-05-16 11:26:21 -07:00

cat-health.md

update old sample names to 'opensearch' instead of 'odfe

2022-05-16 11:26:21 -07:00

cat-indices.md

Add "introduced" labels for APIs

2021-07-26 16:14:22 -07:00

cat-nodeattrs.md

update old sample names to 'opensearch' instead of 'odfe

2022-05-16 11:26:21 -07:00

cat-nodes.md

fix merge conflict

2022-05-18 11:16:11 -07:00

cat-pending-tasks.md

for updates to cluster manager nomenclature throughout descriptive sections

2022-04-27 15:37:49 -07:00

cat-plugins.md

update old sample names to 'opensearch' instead of 'odfe

2022-05-16 11:26:21 -07:00

cat-recovery.md

update old sample names to 'opensearch' instead of 'odfe

2022-05-16 11:26:21 -07:00

cat-repositories.md

Add "introduced" labels for APIs

2021-07-26 16:14:22 -07:00

cat-segments.md

Add "introduced" labels for APIs

2021-07-26 16:14:22 -07:00

cat-shards.md

update old sample names to 'opensearch' instead of 'odfe

2022-05-16 11:26:21 -07:00

cat-snapshots.md

update old sample names to 'opensearch' instead of 'odfe

2022-05-16 11:26:21 -07:00

cat-tasks.md

update old sample names to 'opensearch' instead of 'odfe

2022-05-16 11:26:21 -07:00

cat-templates.md

Add "introduced" labels for APIs

2021-07-26 16:14:22 -07:00

cat-thread-pool.md

update old sample names to 'opensearch' instead of 'odfe

2022-05-16 11:26:21 -07:00

index.md

switch left nav as acronmy-only, and page with full title, then acronym

2022-04-20 10:31:06 -07:00