Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DOCS-2655] Add partial for us3 logs note #10419

Merged
merged 3 commits into from
Nov 10, 2021
Merged

[DOCS-2655] Add partial for us3 logs note #10419

merged 3 commits into from
Nov 10, 2021

Conversation

sarina-dd
Copy link
Contributor

What does this PR do?

Adds the partial and US3 logs note. This will hide the shortcode from rendering in in-app tiles.

Motivation

Jira request

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • PR title must be written as a CHANGELOG entry (see why)
  • Files changes must correspond to the primary purpose of the PR as described in the title (small unrelated changes should have their own PR)
  • PR must have changelog/ and integration/ labels attached

@sarina-dd sarina-dd requested review from anshumgargdd and a team as code owners October 14, 2021 23:09
@sarina-dd sarina-dd changed the title Add partial for us3 logs note [DOCS-2655] Add partial for us3 logs note Oct 19, 2021
@sarina-dd sarina-dd added the editorial review Waiting on a more in-depth review from a docs team editor label Oct 19, 2021
fanny-jiang
fanny-jiang requested changes Oct 28, 2021
View reviewed changes
Copy link
Contributor

@fanny-jiang fanny-jiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there are conflicts in some of the files now that need resolving.

@sarina-dd
Copy link
Contributor Author

@fanny-jiang Just resolved 👍

apigirl
apigirl previously approved these changes Oct 28, 2021
View reviewed changes
@sarina-dd
Copy link
Contributor Author

@fanny-jiang Hi there, can you take another look at this PR for us? I've resolved the merge conflicts.

fanny-jiang
fanny-jiang previously approved these changes Nov 8, 2021
View reviewed changes
@fanny-jiang
Copy link
Contributor

Hi @sarina-dd sorry for the delay! Looks like there's one more conflict that needs resolving. Otherwise, this looks good.

@sarina-dd sarina-dd dismissed stale reviews from fanny-jiang and apigirl via e359c2c November 9, 2021 16:22
@sarina-dd
Copy link
Contributor Author

sarina-dd commented Nov 9, 2021 •
edited
Loading

@fanny-jiang Thanks! Resolved the conflicts. Can you merge on your end? It says merging is blocked as I resolved the conflicts and it removed your approval.

@fanny-jiang fanny-jiang merged commit 29113c9 into master Nov 10, 2021
@fanny-jiang fanny-jiang deleted the sarina/us3-logs-note branch November 10, 2021 17:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apigirl apigirl apigirl approved these changes

@fanny-jiang fanny-jiang fanny-jiang approved these changes

@anshumgargdd anshumgargdd Awaiting requested review from anshumgargdd

Assignees
No one assigned
Labels
changelog/no-changelog documentation editorial review Waiting on a more in-depth review from a docs team editor integration/activemq_xml integration/aerospike integration/airflow integration/ambari integration/apache integration/aspdotnet integration/azure_active_directory integration/azure_iot_edge integration/cassandra_nodetool integration/cassandra integration/ceph integration/cilium integration/citrix_hypervisor integration/clickhouse integration/cockroachdb integration/confluent_platform integration/consul_connect integration/consul integration/coredns integration/couch integration/druid integration/elastic integration/envoy integration/etcd integration/flink integration/fluentd integration/gearmand integration/gitlab integration/glusterfs integration/gunicorn integration/haproxy integration/harbor integration/hazelcast integration/hdfs_datanode integration/hdfs_namenode integration/hive integration/hivemq integration/ibm_db2 integration/ibm_mq integration/ibm_was integration/ignite integration/iis integration/istio integration/jboss_wildfly integration/journald integration/kafka_consumer integration/kafka integration/kong integration/kube_scheduler integration/kyototycoon integration/lighttpd integration/linkerd integration/mapr integration/mapreduce integration/marathon integration/marklogic integration/mcache integration/mesos_master integration/mesos_slave integration/mongo integration/mysql integration/nginx_ingress_controller integration/nginx integration/openldap integration/openshift integration/openstack_controller integration/openstack integration/pgbouncer integration/postfix integration/postgres integration/powerdns_recursor integration/presto integration/proxysql integration/rabbitmq integration/redisdb integration/rethinkdb integration/riak integration/scylla integration/singlestore integration/solr integration/sonarqube integration/sqlserver integration/squid integration/statsd integration/supervisord integration/teamcity integration/tenable integration/tomcat integration/twemproxy integration/twistlock integration/varnish integration/vault integration/vertica integration/voltdb integration/yarn integration/zk
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sarina-dd @fanny-jiang @apigirl