From 5edbf5ba6611d45f5ce4fe4048d0315938557806 Mon Sep 17 00:00:00 2001 From: zezha-msft Date: Mon, 13 Nov 2017 16:29:15 -0800 Subject: [PATCH] Minor: update readme with new link to reference doc --- README.rst | 11 ++++++----- azure-storage-file/azure/storage/file/models.py | 4 ---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index 89953a39..59bef5d6 100644 --- a/README.rst +++ b/README.rst @@ -1,14 +1,14 @@ Microsoft Azure Storage SDK for Python ====================================== -.. image:: https://travis-ci.org/Azure/azure-storage-python.svg?branch=dev +.. image:: https://travis-ci.org/Azure/azure-storage-python.svg :target: https://travis-ci.org/Azure/azure-storage-python -.. image:: https://img.shields.io/codecov/c/github/azure/azure-storage-python/dev.svg - :target: https://codecov.io/gh/Azure/azure-storage-python/branch/dev +.. image:: https://img.shields.io/codecov/c/github/azure/azure-storage-python.svg + :target: https://codecov.io/gh/Azure/azure-storage-python This project provides a client library in Python that makes it easy to consume Microsoft Azure Storage services. For documentation please see -the Microsoft Azure `Python Developer Center`_ and our `API Reference`_ Page. +the Microsoft Azure `Python Developer Center`_ and our `API Reference`_ (also available on `readthedocs`_). If you are looking for the Service Bus or Azure Management libraries, please visit @@ -216,7 +216,8 @@ Learn More - `API Reference`_ .. _Python Developer Center: http://azure.microsoft.com/en-us/develop/python/ -.. _API Reference: https://azure-storage.readthedocs.io/en/latest/ +.. _API Reference: https://docs.microsoft.com/en-us/python/api/overview/azure/storage/clientlibrary?view=azure-python +.. _readthedocs: https://azure-storage.readthedocs.io/en/latest/ .. _here: https://github.com/Azure/azure-storage-python/archive/master.zip .. _create an account: https://account.windowsazure.com/signup .. _Developer Forums on MSDN: http://social.msdn.microsoft.com/Forums/windowsazure/en-US/home?forum=windowsazuredata diff --git a/azure-storage-file/azure/storage/file/models.py b/azure-storage-file/azure/storage/file/models.py index a633fc50..86e9ed66 100644 --- a/azure-storage-file/azure/storage/file/models.py +++ b/azure-storage-file/azure/storage/file/models.py @@ -28,15 +28,11 @@ class Share(object): This var is set to None unless the include=metadata param was included for the list shares operation. If this parameter was specified but the share has no metadata, metadata will be set to an empty dictionary. -<<<<<<< HEAD:azure-storage-file/azure/storage/file/models.py :vartype metadata: dict(str, str) -======= - :vartype metadata: dict mapping str to str :ivar str snapshot: A DateTime value that uniquely identifies the snapshot. The value of this header indicates the snapshot version, and may be used in subsequent requests to access the snapshot. ->>>>>>> 8cc3167... sharesnapshot:azure/storage/file/models.py ''' def __init__(self, name=None, props=None, metadata=None, snapshot=None):