Skip to content

Commit 8d10e9e

Browse files
authored
Merge branch 'master' into add_vcn_docs
2 parents b52ab6b + 27cf90b commit 8d10e9e

File tree

137 files changed

+2515
-438
lines changed

Some content is hidden

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

137 files changed

+2515
-438
lines changed

CHANGELOG.rst

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,35 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
66

7-
============
8-
Unreleased
9-
============
7+
====================
8+
1.1.2 - 2017-03-16
9+
====================
10+
11+
-------
12+
Changed
13+
-------
1014

15+
* Updated cryptography version to 1.8.1
16+
17+
====================
18+
1.1.1 - 2017-02-23
19+
====================
20+
21+
-------
22+
Added
23+
-------
24+
25+
* Support for iPXE script parameter to launch_instance operation
26+
* Support for stateless security list rules
1127

1228
====================
1329
1.1.0 - 2017-02-03
1430
====================
1531

32+
-------
33+
Added
34+
-------
35+
1636
* Support added for Core Services:
1737

1838
* Block Storage

CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Contributing to the Oracle Bare Metal Cloud Services Python SDK
22
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
33

4-
*Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.*
4+
*Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.*
55

66
Pull requests can be made under
77
`The Oracle Contributor Agreement <https://www.oracle.com/technetwork/community/oca-486395.html>`_ (OCA).

LICENSE.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
1+
Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
22

33
This software is dual-licensed to you under the Universal Permissive License (UPL) and Apache License 2.0. See below for license terms. You may choose either license, or both.
44
____________________________
55
The Universal Permissive License (UPL), Version 1.0
6-
Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
77

88
Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this software, associated documentation and/or data (collectively the "Software"), free of charge and under any and all copyright rights in the Software, and any and all patent rights owned or freely licensable by each licensor hereunder covering either (i) the unmodified Software as contributed to or provided by such licensor, or (ii) the Larger Works (as defined below), to deal in both
99

@@ -19,7 +19,7 @@ The above copyright notice and either this complete permission notice or at a mi
1919
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2020

2121
The Apache Software License, Version 2.0
22-
Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
22+
Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
2323

2424
Licensed under the Apache License, Version 2.0 (the "License"); You may not use this product except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0. A copy of the license is also reproduced below. Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
2525

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ __ https://oracle-bare-metal-cloud-services-python-sdk.readthedocs.io/en/latest/
6969
Help
7070
====
7171

72-
See the “Questions or Feedback?” section `here`__.
72+
See the “Questions or Feedback” section `here`__.
7373

74-
__ https://oracle-bare-metal-cloud-services-python-sdk.readthedocs.io/en/latest/installation.html#questions-or-feedback
74+
__ https://oracle-bare-metal-cloud-services-python-sdk.readthedocs.io/en/latest/feedback.html
7575

7676
=======
7777
Changes
@@ -105,10 +105,10 @@ __ https://github.com/oracle/bmcs-python-sdk
105105
License
106106
=======
107107

108-
Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
108+
Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
109109

110110
This SDK and sample is dual licensed under the Universal Permissive License 1.0 and the Apache License 2.0.
111111

112112
See `LICENSE`__ for more details.
113113

114-
__ https://github.com/oracle/bmcs-python-sdk/blob/master/LICENSE.txt
114+
__ https://github.com/oracle/bmcs-python-sdk/blob/master/LICENSE.txt

docs/api/index.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ Virtual Network
3030

3131
.. autoclass:: oraclebmc.core.virtual_network_client.VirtualNetworkClient
3232
:members:
33-
33+
3434
--------
3535
Models
3636
--------
3737

3838
.. automodule:: oraclebmc.core.models
3939
:members:
40+
:undoc-members:
4041
:imported-members:
4142

4243
==========

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# General information about the project.
2222
project = "oraclebmc"
23-
copyright = "2017, Oracle"
23+
copyright = "2016, 2017, Oracle"
2424
author = "Oracle"
2525

2626
try:
@@ -32,7 +32,7 @@
3232
print("metadata. A virtualenv is recommended!")
3333
sys.exit(1)
3434
del pkg_resources
35-
version = ".".join(release.split(".")[:2])
35+
version = ".".join(release.split(".")[:3])
3636

3737
language = "en"
3838

docs/configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ Since ``config`` is a dict, you can also build it manually and check it with
4848
These are supported across the SDKs, so if you've already set this file up for the Ruby or Java SDKs,
4949
you're all set.
5050

51-
__ https://docs.us-az-phoenix-1.oracleiaas.com/Content/API/Concepts/sdkconfig.htm
51+
__ https://docs.us-phoenix-1.oraclecloud.com/Content/API/Concepts/sdkconfig.htm

docs/contributions.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.. _contributions:
2+
3+
Contributions
4+
~~~~~~~~~~~~~~~~~~~~~~
5+
Got a fix for a bug, or a new feature you'd like to contribute? The SDK is open source and accepting pull requests on `GitHub <https://github.com/oracle/bmcs-python-sdk>`_.

docs/feedback.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
.. _feedback:
2+
3+
4+
Questions or Feedback
5+
~~~~~~~~~~~~~~~~~~~~~~
6+
7+
Ways to get in touch:
8+
9+
* `GitHub`_: To file bugs and feature requests only
10+
11+
* `Stack Overflow`_: Please use the `oracle-bmcs`_ and `oracle-bmcs-python-sdk`_ tags in your post
12+
13+
* `Developer Tools section`_ of the Oracle Cloud forums
14+
15+
* `My Oracle Support`_
16+
17+
.. _GitHub: https://github.com/oracle/bmcs-python-sdk/issues
18+
.. _Stack Overflow: https://stackoverflow.com/
19+
.. _oracle-bmcs: https://stackoverflow.com/questions/tagged/oracle-bmcs
20+
.. _oracle-bmcs-python-sdk: https://stackoverflow.com/questions/tagged/oracle-bmcs-python-sdk
21+
.. _Developer Tools section: https://community.oracle.com/community/cloud_computing/bare-metal/content?filterID=contentstatus[published]~category[developer-tools]
22+
.. _My Oracle Support: https://support.oracle.com/

docs/index.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Oracle BMCS Python SDK
2-
~~~~~~~~~~~~~~~~~~~~~
2+
~~~~~~~~~~~~~~~~~~~~~~
33

44
This is the public Python SDK for Oracle Bare Metal Cloud Services. Python 2.7+ and 3.5+ are supported.
55

@@ -34,5 +34,9 @@ To get started, head over to the :ref:`installation instructions <install>` or s
3434
installation
3535
configuration
3636
quickstart
37+
raw-requests
3738
api/index
39+
contributions
40+
notifications
3841
license
42+
feedback

0 commit comments

Comments
 (0)