Skip to content

Commit 495862f

Browse files
alai8alai8
committed
Merge branch 'develop' into owls-70947
2 parents 8258259 + 408d9c6 commit 495862f

File tree

464 files changed

+2620
-5794
lines changed

Some content is hidden

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

464 files changed

+2620
-5794
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ Oracle is finding ways for organizations using WebLogic Server to run important
1818
* Scale WebLogic domains by starting and stopping Managed Servers on demand, or by integrating with a REST API to initiate scaling based on WLDF, Prometheus, Grafana, or other rules.
1919
* Publish operator and WebLogic Server logs into Elasticsearch and interact with them in Kibana.
2020

21-
The fastest way to experience the operator is to follow the [Quick start guide](site/quickstart.md), or you can peruse our [documentation](site), read our [blogs](https://blogs.oracle.com/weblogicserver/how-to-weblogic-server-on-kubernetes), or try out the [samples](kubernetes/samples/README.md).
21+
The fastest way to experience the operator is to follow the [Quick Start guide](site/quickstart.md), or you can peruse our [documentation](site), read our [blogs](https://blogs.oracle.com/weblogicserver/how-to-weblogic-server-on-kubernetes), or try out the [samples](kubernetes/samples/README.md).
2222

2323
```diff
2424
+ The current release of the operator is 2.0-rc2, a release candidate for our 2.0 release.
25-
+ This release candidate was published on Jan. 10, 2019.
25+
+ This release candidate was published on Jan. 17, 2019.
2626
+ We expect to publish the final 2.0 release later in January, 2019.
2727
+ We expect that there will be some minor changes to documentation and samples in the final 2.0 release.
2828
+ However, this release candidate is suitable for testing and early adopters.
@@ -54,7 +54,7 @@ maintained for one release after a replacement is available.
5454
This documentation includes sections targeted to different audiences. To help you find what you are looking for more easily,
5555
please consult this table of contents:
5656

57-
* The [Quick start guide](site/quickstart.md) explains how to quickly get the operator running, using the defaults, nothing special.
57+
* The [Quick Start guide](site/quickstart.md) explains how to quickly get the operator running, using the defaults, nothing special.
5858
* The [User guide](site/user-guide.md) contains detailed usage information, including how to install and configure the operator,
5959
and how to use it to create and manage WebLogic domains.
6060
* The [Samples](kubernetes/samples/README.md) provide detailed example code and instructions that show you how to perform

‎docs/apidocs/allclasses-frame.html

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<<<<<<< HEAD
6-
<!-- Generated by javadoc (1.8.0_161) on Thu Dec 20 08:42:26 EST 2018 -->
7-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
8-
<title>All Classes (operator-runtime 2.0-rc1 API)</title>
9-
<meta name="date" content="2018-12-20">
10-
=======
115
<!-- Generated by javadoc -->
126
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
13-
<title>All Classes (operator-runtime 2.0-rc2 API)</title>
14-
>>>>>>> 99e39d87... Remove timestamp from javadoc
7+
<title>All Classes (operator-runtime 2.0-SNAPSHOT API)</title>
158
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
169
<script type="text/javascript" src="script.js"></script>
1710
</head>
@@ -84,8 +77,6 @@ <h1 class="bar">All&nbsp;Classes</h1>
8477
<li><a href="oracle/kubernetes/operator/rest/model/ErrorModel.html" title="class in oracle.kubernetes.operator.rest.model" target="classFrame">ErrorModel</a></li>
8578
<li><a href="oracle/kubernetes/operator/EventWatcher.html" title="class in oracle.kubernetes.operator" target="classFrame">EventWatcher</a></li>
8679
<li><a href="oracle/kubernetes/operator/rest/ExceptionMapper.html" title="class in oracle.kubernetes.operator.rest" target="classFrame">ExceptionMapper</a></li>
87-
<li><a href="oracle/kubernetes/operator/steps/ExternalAdminChannelIteratorStep.html" title="class in oracle.kubernetes.operator.steps" target="classFrame">ExternalAdminChannelIteratorStep</a></li>
88-
<li><a href="oracle/kubernetes/operator/steps/ExternalAdminChannelsStep.html" title="class in oracle.kubernetes.operator.steps" target="classFrame">ExternalAdminChannelsStep</a></li>
8980
<li><a href="oracle/kubernetes/operator/work/Fiber.html" title="class in oracle.kubernetes.operator.work" target="classFrame">Fiber</a></li>
9081
<li><a href="oracle/kubernetes/operator/work/Fiber.CompletionCallback.html" title="interface in oracle.kubernetes.operator.work" target="classFrame"><span class="interfaceName">Fiber.CompletionCallback</span></a></li>
9182
<li><a href="oracle/kubernetes/operator/work/Fiber.ExitCallback.html" title="interface in oracle.kubernetes.operator.work" target="classFrame"><span class="interfaceName">Fiber.ExitCallback</span></a></li>

‎docs/apidocs/allclasses-noframe.html

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<<<<<<< HEAD
6-
<!-- Generated by javadoc (1.8.0_161) on Thu Dec 20 08:42:26 EST 2018 -->
7-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
8-
<title>All Classes (operator-runtime 2.0-rc1 API)</title>
9-
<meta name="date" content="2018-12-20">
10-
=======
115
<!-- Generated by javadoc -->
126
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
13-
<title>All Classes (operator-runtime 2.0-rc2 API)</title>
14-
>>>>>>> 99e39d87... Remove timestamp from javadoc
7+
<title>All Classes (operator-runtime 2.0-SNAPSHOT API)</title>
158
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
169
<script type="text/javascript" src="script.js"></script>
1710
</head>
@@ -84,8 +77,6 @@ <h1 class="bar">All&nbsp;Classes</h1>
8477
<li><a href="oracle/kubernetes/operator/rest/model/ErrorModel.html" title="class in oracle.kubernetes.operator.rest.model">ErrorModel</a></li>
8578
<li><a href="oracle/kubernetes/operator/EventWatcher.html" title="class in oracle.kubernetes.operator">EventWatcher</a></li>
8679
<li><a href="oracle/kubernetes/operator/rest/ExceptionMapper.html" title="class in oracle.kubernetes.operator.rest">ExceptionMapper</a></li>
87-
<li><a href="oracle/kubernetes/operator/steps/ExternalAdminChannelIteratorStep.html" title="class in oracle.kubernetes.operator.steps">ExternalAdminChannelIteratorStep</a></li>
88-
<li><a href="oracle/kubernetes/operator/steps/ExternalAdminChannelsStep.html" title="class in oracle.kubernetes.operator.steps">ExternalAdminChannelsStep</a></li>
8980
<li><a href="oracle/kubernetes/operator/work/Fiber.html" title="class in oracle.kubernetes.operator.work">Fiber</a></li>
9081
<li><a href="oracle/kubernetes/operator/work/Fiber.CompletionCallback.html" title="interface in oracle.kubernetes.operator.work"><span class="interfaceName">Fiber.CompletionCallback</span></a></li>
9182
<li><a href="oracle/kubernetes/operator/work/Fiber.ExitCallback.html" title="interface in oracle.kubernetes.operator.work"><span class="interfaceName">Fiber.ExitCallback</span></a></li>

0 commit comments

Comments
 (0)