Skip to content

Commit bd0b6d9

Browse files
chunshi-orachunshi-ora
committed
Merge branch 'develop' of https://github.com/oracle/weblogic-kubernetes-operator into chshi-OWLS-70886-svc-upt2
2 parents b426a88 + 89f8542 commit bd0b6d9

File tree

433 files changed

+3100
-443
lines changed

Some content is hidden

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

433 files changed

+3100
-443
lines changed

‎LICENSE renamed to ‎LICENSE.txt

File renamed without changes.

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ Oracle is finding ways for organizations using WebLogic Server to run important
2121
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
24-
+ The current release of the operator is 2.0-rc1, a release candidate for our 2.0 release.
25-
+ This release candidate was published on Dec 20, 2018.
26-
+ We expect to publish the final 2.0 release in January 2019.
24+
+ 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.
26+
+ 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.
2929
```

‎THIRDPARTY renamed to ‎THIRD_PARTY_LICENSES.txt

File renamed without changes.

‎docs/apidocs/allclasses-frame.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5+
<<<<<<< HEAD
56
<!-- Generated by javadoc (1.8.0_161) on Thu Dec 20 08:42:26 EST 2018 -->
67
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
78
<title>All Classes (operator-runtime 2.0-rc1 API)</title>
89
<meta name="date" content="2018-12-20">
10+
=======
11+
<!-- Generated by javadoc -->
12+
<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
915
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1016
<script type="text/javascript" src="script.js"></script>
1117
</head>

‎docs/apidocs/allclasses-noframe.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5+
<<<<<<< HEAD
56
<!-- Generated by javadoc (1.8.0_161) on Thu Dec 20 08:42:26 EST 2018 -->
67
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
78
<title>All Classes (operator-runtime 2.0-rc1 API)</title>
89
<meta name="date" content="2018-12-20">
10+
=======
11+
<!-- Generated by javadoc -->
12+
<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
915
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1016
<script type="text/javascript" src="script.js"></script>
1117
</head>

‎docs/apidocs/constant-values.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5+
<<<<<<< HEAD
56
<!-- Generated by javadoc (1.8.0_161) on Thu Dec 20 08:42:24 EST 2018 -->
67
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
78
<title>Constant Field Values (operator-runtime 2.0-rc1 API)</title>
89
<meta name="date" content="2018-12-20">
10+
=======
11+
<!-- Generated by javadoc -->
12+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
13+
<title>Constant Field Values (operator-runtime 2.0-rc2 API)</title>
14+
>>>>>>> 99e39d87... Remove timestamp from javadoc
915
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1016
<script type="text/javascript" src="script.js"></script>
1117
</head>
@@ -1822,6 +1828,6 @@ <h2 title="oracle.kubernetes">oracle.kubernetes.*</h2>
18221828
<!-- -->
18231829
</a></div>
18241830
<!-- ======== END OF BOTTOM NAVBAR ======= -->
1825-
<p class="legalCopy"><small><p>Copyright 2018, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. All rights reserved. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="http://oss.oracle.com/licenses/upl">http://oss.oracle.com/licenses/upl</a>.<p></small></p>
1831+
<p class="legalCopy"><small><p>Copyright 2018, 2019, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. All rights reserved. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="http://oss.oracle.com/licenses/upl">http://oss.oracle.com/licenses/upl</a>.<p></small></p>
18261832
</body>
18271833
</html>

‎docs/apidocs/deprecated-list.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5+
<<<<<<< HEAD
56
<!-- Generated by javadoc (1.8.0_161) on Thu Dec 20 08:42:26 EST 2018 -->
67
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
78
<title>Deprecated List (operator-runtime 2.0-rc1 API)</title>
89
<meta name="date" content="2018-12-20">
10+
=======
11+
<!-- Generated by javadoc -->
12+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
13+
<title>Deprecated List (operator-runtime 2.0-rc2 API)</title>
14+
>>>>>>> 99e39d87... Remove timestamp from javadoc
915
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1016
<script type="text/javascript" src="script.js"></script>
1117
</head>
@@ -145,6 +151,6 @@ <h2 title="Contents">Contents</h2>
145151
<!-- -->
146152
</a></div>
147153
<!-- ======== END OF BOTTOM NAVBAR ======= -->
148-
<p class="legalCopy"><small><p>Copyright 2018, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. All rights reserved. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="http://oss.oracle.com/licenses/upl">http://oss.oracle.com/licenses/upl</a>.<p></small></p>
154+
<p class="legalCopy"><small><p>Copyright 2018, 2019, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. All rights reserved. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="http://oss.oracle.com/licenses/upl">http://oss.oracle.com/licenses/upl</a>.<p></small></p>
149155
</body>
150156
</html>

‎docs/apidocs/help-doc.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5+
<<<<<<< HEAD
56
<!-- Generated by javadoc (1.8.0_161) on Thu Dec 20 08:42:26 EST 2018 -->
67
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
78
<title>API Help (operator-runtime 2.0-rc1 API)</title>
89
<meta name="date" content="2018-12-20">
10+
=======
11+
<!-- Generated by javadoc -->
12+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
13+
<title>API Help (operator-runtime 2.0-rc2 API)</title>
14+
>>>>>>> 99e39d87... Remove timestamp from javadoc
915
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1016
<script type="text/javascript" src="script.js"></script>
1117
</head>
@@ -226,6 +232,6 @@ <h2>Constant Field Values</h2>
226232
<!-- -->
227233
</a></div>
228234
<!-- ======== END OF BOTTOM NAVBAR ======= -->
229-
<p class="legalCopy"><small><p>Copyright 2018, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. All rights reserved. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="http://oss.oracle.com/licenses/upl">http://oss.oracle.com/licenses/upl</a>.<p></small></p>
235+
<p class="legalCopy"><small><p>Copyright 2018, 2019, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. All rights reserved. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="http://oss.oracle.com/licenses/upl">http://oss.oracle.com/licenses/upl</a>.<p></small></p>
230236
</body>
231237
</html>

‎docs/apidocs/index-all.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5+
<<<<<<< HEAD
56
<!-- Generated by javadoc (1.8.0_161) on Thu Dec 20 08:42:26 EST 2018 -->
67
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
78
<title>Index (operator-runtime 2.0-rc1 API)</title>
89
<meta name="date" content="2018-12-20">
10+
=======
11+
<!-- Generated by javadoc -->
12+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
13+
<title>Index (operator-runtime 2.0-rc2 API)</title>
14+
>>>>>>> 99e39d87... Remove timestamp from javadoc
915
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
1016
<script type="text/javascript" src="script.js"></script>
1117
</head>
@@ -4316,6 +4322,6 @@ <h2 class="title">W</h2>
43164322
<!-- -->
43174323
</a></div>
43184324
<!-- ======== END OF BOTTOM NAVBAR ======= -->
4319-
<p class="legalCopy"><small><p>Copyright 2018, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. All rights reserved. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="http://oss.oracle.com/licenses/upl">http://oss.oracle.com/licenses/upl</a>.<p></small></p>
4325+
<p class="legalCopy"><small><p>Copyright 2018, 2019, <a href="http://www.oracle.com">Oracle Corporation</a> and/or its affiliates. All rights reserved. <br />Licensed under the Universal Permissive License v 1.0 as shown at <a href="http://oss.oracle.com/licenses/upl">http://oss.oracle.com/licenses/upl</a>.<p></small></p>
43204326
</body>
43214327
</html>

‎docs/apidocs/index.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5+
<<<<<<< HEAD
56
<!-- Generated by javadoc (1.8.0_161) on Thu Dec 20 08:42:26 EST 2018 -->
7+
=======
8+
<!-- Generated by javadoc -->
9+
>>>>>>> 99e39d87... Remove timestamp from javadoc
610
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
711
<title>operator-runtime 2.0-rc1 API</title>
812
<script type="text/javascript">

0 commit comments

Comments
 (0)