From 7dd4cae549d4178d6a818c12fda86e77af59d968 Mon Sep 17 00:00:00 2001
From: Martin Milata <mmilata@redhat.com>
Date: Mar 10 2016 16:22:33 +0000
Subject: Merge branch 'master' into release branches


---

diff --git a/.gitignore b/.gitignore
index 39262ce..eaedfb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /osbs-client-49ef2c5d631b8a0c5f82a1d9354e6f7271ba5f12.tar.gz
 /osbs-client-a8a926ef34b44a52da42fa07b3847efaaf06b12a.tar.gz
 /osbs-client-526c8168d024f3ab14a0ef341c2911e9176f99aa.tar.gz
+/osbs-client-a4eacee8295df458f31a4ed4277ea080db2182a7.tar.gz
diff --git a/osbs-client.spec b/osbs-client.spec
index 9e2a30d..83ee426 100644
--- a/osbs-client.spec
+++ b/osbs-client.spec
@@ -22,7 +22,7 @@
 %global with_check 1
 %endif
 
-%global commit 526c8168d024f3ab14a0ef341c2911e9176f99aa
+%global commit a4eacee8295df458f31a4ed4277ea080db2182a7
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 # set to 0 to create a normal release
 %global postrelease 0
@@ -31,7 +31,7 @@
 %global osbs_obsolete_vr 0.14-2
 
 Name:           osbs-client
-Version:        0.17
+Version:        0.18
 %if "x%{postrelease}" != "x0"
 Release:        %{release}.%{postrelease}.git.%{shortcommit}%{?dist}
 %else
@@ -192,9 +192,15 @@ LANG=en_US.utf8 py.test-%{python2_version} -vv tests
 %endif # with_python3
 
 %changelog
-* Fri Feb 12 2016 Martin Milata <mmilata@redhat.com> - 0.17-1
+* Thu Mar 10 2016 Martin Milata <mmilata@redhat.com> - 0.18-1
+- new upstream release: 0.18
+
+* Fri Feb 12 2016 Martin Milata <mmilata@redhat.com> - 0.17-2
 - new upstream release: 0.17
 
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Thu Jan 21 2016 Martin Milata <mmilata@redhat.com> - 0.16-1
 - new upstream release: 0.16
 
diff --git a/sources b/sources
index 71ea941..cdaf04f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e1f91d940ba28e7dcf6f64dec04c36b  osbs-client-526c8168d024f3ab14a0ef341c2911e9176f99aa.tar.gz
+68eb4628b89b14e4bea70e6024a84252  osbs-client-a4eacee8295df458f31a4ed4277ea080db2182a7.tar.gz