boto/cacerts/__init__.py - Issue 8386013: Merging in latest boto.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: boto/cacerts/init.py

Issue 8386013: Merging in latest boto. (Closed) Base URL: svn://svn.chromium.org/boto

Patch Set: Redoing vendor drop by deleting and then merging. Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: boto/cacerts/__init__.py

diff --git a/boto/tests/__init__.py b/boto/cacerts/__init__.py

similarity index 93%

copy from boto/tests/__init__.py

copy to boto/cacerts/__init__.py

index 449bd162a8ea33724103f1cba717f3255d1edea1..1b2dec79e76ca0e13e32eb2533430c1125b3f7cd 100644

--- a/boto/tests/__init__.py

+++ b/boto/cacerts/__init__.py

@@ -1,4 +1,5 @@

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the

@@ -14,10 +15,8 @@

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-

# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT

-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+# SHALL THE AUTHOR 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.

« no previous file with comments | « boto/auth.py ('k') | boto/cacerts/cacerts.txt » ('j') | no next file with comments »