[docker-io/epel7] upstream version bump to v1.0.0
Lokesh Mandvekar
lsm5 at fedoraproject.org
Mon Jun 9 15:24:12 UTC 2014
commit 6a974a71f09a41ff338a0a0d8774f8ad09ebbee8
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date: Mon Jun 9 10:33:07 2014 -0400
upstream version bump to v1.0.0
docker-io.spec | 24 +++-
docker.service | 5 +-
docker.sysconfig | 48 +++++++
sources | 2 +-
upstream-patched-archive-tar.patch | 248 ++++++++++++++++++++++++------------
5 files changed, 237 insertions(+), 90 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index df4397b..b176a1e 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -5,11 +5,11 @@
%global debug_package %{nil}
%global gopath %{_datadir}/gocode
-%global commit 14680bf724161785d164fd99de36e3eb03a823ef
+%global commit 63fe64c471e7d76be96a625350468dfc65c06c31
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: docker-io
-Version: 0.12.0
+Version: 1.0.0
Release: 1%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
@@ -19,6 +19,7 @@ URL: http://www.docker.io
ExclusiveArch: x86_64
Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
Source1: docker.service
+Source2: docker.sysconfig
BuildRequires: gcc
BuildRequires: glibc-static
# ensure build uses golang 1.2-7 and above
@@ -109,6 +110,10 @@ install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
install -d %{buildroot}%{_unitdir}
#install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
+install -p -m 644 contrib/init/systemd/socket-activation/docker.socket %{buildroot}%{_unitdir}
+# for additional args
+install -d %{buildroot}%{_sysconfdir}/sysconfig/
+install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker
%pre
getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
@@ -132,6 +137,8 @@ exit 0
%dir %{_libexecdir}/docker
%{_libexecdir}/docker/dockerinit
%{_unitdir}/docker.service
+%{_unitdir}/docker.socket
+%{_sysconfdir}/sysconfig/docker
%dir %{_sysconfdir}/bash_completion.d
%{_sysconfdir}/bash_completion.d/docker.bash
%{_datadir}/zsh/site-functions/_docker
@@ -146,6 +153,9 @@ exit 0
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Mon Jun 09 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 1.0.0-1
+- upstream version bump to v1.0.0
+
* Mon Jun 09 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0.12.0-1
- RHBZ#1105789 Upstream bump to 0.12.0
@@ -180,6 +190,11 @@ exit 0
* Wed May 14 2014 John Seybold <jwseybold at gmail.com> - 0.11.1-4
- enable btrfs for rhel 7
+* Mon May 12 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.11.1-3
+- enable selinux
+- delete rhel/fedora conditionals
+- generate manpages during build
+
* Fri May 09 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.11.1-3
- add selinux buildtag
- enable selinux in unitfile
@@ -187,11 +202,6 @@ exit 0
* Fri May 09 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.11.1-2
- get rid of conditionals, separate out spec for each branch
-* Mon May 12 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.11.1-3
-- enable selinux
-- delete rhel/fedora conditionals
-- generate manpages during build
-
* Mon Apr 14 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.10.0-2
- regenerate btrfs removal patch
- update commit value
diff --git a/docker.service b/docker.service
index 1a63071..e2aace1 100644
--- a/docker.service
+++ b/docker.service
@@ -2,9 +2,12 @@
Description=Docker Application Container Engine
Documentation=http://docs.docker.io
After=network.target
+Requires=docker.socket
[Service]
-ExecStart=/usr/bin/docker -d --selinux-enabled
+Type=notify
+EnvironmentFile=-/etc/sysconfig/docker
+ExecStart=/usr/bin/docker -d --selinux-enabled -H fd://
Restart=on-failure
LimitNOFILE=1048576
LimitNPROC=1048576
diff --git a/docker.sysconfig b/docker.sysconfig
new file mode 100644
index 0000000..25a81d3
--- /dev/null
+++ b/docker.sysconfig
@@ -0,0 +1,48 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+<head>
+<title>docker-io.git - docker-io</title>
+<meta name='generator' content='cgit v0.10.1'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
+<link rel='shortcut icon' href='/favicon.ico'/>
+<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/docker-io.git/atom/docker.sysconfig?h=master' type='application/atom+xml'/>
+</head>
+<body>
+<div id='cgit'><table id='header'>
+<tr>
+<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
+<td class='main'><a href='/cgit/'>index</a> : <a title='docker-io.git' href='/cgit/docker-io.git/'>docker-io.git</a></td><td class='form'><form method='get' action=''>
+<select name='h' onchange='this.form.submit();'>
+<option value='el6'>el6</option>
+<option value='epel7'>epel7</option>
+<option value='f18'>f18</option>
+<option value='f19'>f19</option>
+<option value='f20'>f20</option>
+<option value='master' selected='selected'>master</option>
+</select> <input type='submit' name='' value='switch'/></form></td></tr>
+<tr><td class='sub'>docker-io</td><td class='sub right'>Jon Ciesla</td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/cgit/docker-io.git/'>summary</a><a href='/cgit/docker-io.git/refs/'>refs</a><a href='/cgit/docker-io.git/log/docker.sysconfig'>log</a><a class='active' href='/cgit/docker-io.git/tree/docker.sysconfig'>tree</a><a href='/cgit/docker-io.git/commit/docker.sysconfig'>commit</a><a href='/cgit/docker-io.git/diff/docker.sysconfig'>diff</a><a href='/cgit/docker-io.git/stats/docker.sysconfig'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/docker-io.git/log/docker.sysconfig'>
+<select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+<option value='range'>range</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='path'>path: <a href='/cgit/docker-io.git/tree/'>root</a>/<a href='/cgit/docker-io.git/tree/docker.sysconfig'>docker.sysconfig</a></div><div class='content'>blob: a2fd2af7acc94513f3bfded99398b7201bf0f8b2 (<a href='/cgit/docker-io.git/plain/docker.sysconfig'>plain</a>)
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
+</pre></td>
+<td class='lines'><pre><code># /etc/sysconfig/docker
+</code></pre></td></tr></table>
+</div> <!-- class=content -->
+<div class='footer'>generated by cgit v0.10.1 at 2014-06-09 15:21:07 (GMT)</div>
+</div> <!-- id=cgit -->
+</body>
+</html>
diff --git a/sources b/sources
index 54f1744..3ab3623 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-800973801b4a833a94485cdc2f28ee30 v0.12.0.tar.gz
+c835295e1e0609affe9a3c7ec75d7240 v1.0.0.tar.gz
diff --git a/upstream-patched-archive-tar.patch b/upstream-patched-archive-tar.patch
index 11ee5d1..2e537d5 100644
--- a/upstream-patched-archive-tar.patch
+++ b/upstream-patched-archive-tar.patch
@@ -1,42 +1,172 @@
-<<<<<<< HEAD
-diff -uNr docker-0.11.1/archive/archive.go docker-0.11.1-1/archive/archive.go
---- docker-0.11.1/archive/archive.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/archive/archive.go 2014-05-12 11:13:56.346022537 -0400
-@@ -8,7 +8,7 @@
- "fmt"
-=======
-diff -uNr docker-0.12.0/archive/archive.go docker-0.12.0-1/archive/archive.go
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+<head>
+<title>docker-io.git - docker-io</title>
+<meta name='generator' content='cgit v0.10.1'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
+<link rel='shortcut icon' href='/favicon.ico'/>
+<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/docker-io.git/atom/upstream-patched-archive-tar.patch?h=master' type='application/atom+xml'/>
+</head>
+<body>
+<div id='cgit'><table id='header'>
+<tr>
+<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
+<td class='main'><a href='/cgit/'>index</a> : <a title='docker-io.git' href='/cgit/docker-io.git/'>docker-io.git</a></td><td class='form'><form method='get' action=''>
+<select name='h' onchange='this.form.submit();'>
+<option value='el6'>el6</option>
+<option value='epel7'>epel7</option>
+<option value='f18'>f18</option>
+<option value='f19'>f19</option>
+<option value='f20'>f20</option>
+<option value='master' selected='selected'>master</option>
+</select> <input type='submit' name='' value='switch'/></form></td></tr>
+<tr><td class='sub'>docker-io</td><td class='sub right'>Jon Ciesla</td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/cgit/docker-io.git/'>summary</a><a href='/cgit/docker-io.git/refs/'>refs</a><a href='/cgit/docker-io.git/log/upstream-patched-archive-tar.patch'>log</a><a class='active' href='/cgit/docker-io.git/tree/upstream-patched-archive-tar.patch'>tree</a><a href='/cgit/docker-io.git/commit/upstream-patched-archive-tar.patch'>commit</a><a href='/cgit/docker-io.git/diff/upstream-patched-archive-tar.patch'>diff</a><a href='/cgit/docker-io.git/stats/upstream-patched-archive-tar.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/docker-io.git/log/upstream-patched-archive-tar.patch'>
+<select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+<option value='range'>range</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='path'>path: <a href='/cgit/docker-io.git/tree/'>root</a>/<a href='/cgit/docker-io.git/tree/upstream-patched-archive-tar.patch'>upstream-patched-archive-tar.patch</a></div><div class='content'>blob: 061656accc019b35a57da1c1559f778a5c5f4069 (<a href='/cgit/docker-io.git/plain/upstream-patched-archive-tar.patch'>plain</a>)
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
+<a id='n2' href='#n2'>2</a>
+<a id='n3' href='#n3'>3</a>
+<a id='n4' href='#n4'>4</a>
+<a id='n5' href='#n5'>5</a>
+<a id='n6' href='#n6'>6</a>
+<a id='n7' href='#n7'>7</a>
+<a id='n8' href='#n8'>8</a>
+<a id='n9' href='#n9'>9</a>
+<a id='n10' href='#n10'>10</a>
+<a id='n11' href='#n11'>11</a>
+<a id='n12' href='#n12'>12</a>
+<a id='n13' href='#n13'>13</a>
+<a id='n14' href='#n14'>14</a>
+<a id='n15' href='#n15'>15</a>
+<a id='n16' href='#n16'>16</a>
+<a id='n17' href='#n17'>17</a>
+<a id='n18' href='#n18'>18</a>
+<a id='n19' href='#n19'>19</a>
+<a id='n20' href='#n20'>20</a>
+<a id='n21' href='#n21'>21</a>
+<a id='n22' href='#n22'>22</a>
+<a id='n23' href='#n23'>23</a>
+<a id='n24' href='#n24'>24</a>
+<a id='n25' href='#n25'>25</a>
+<a id='n26' href='#n26'>26</a>
+<a id='n27' href='#n27'>27</a>
+<a id='n28' href='#n28'>28</a>
+<a id='n29' href='#n29'>29</a>
+<a id='n30' href='#n30'>30</a>
+<a id='n31' href='#n31'>31</a>
+<a id='n32' href='#n32'>32</a>
+<a id='n33' href='#n33'>33</a>
+<a id='n34' href='#n34'>34</a>
+<a id='n35' href='#n35'>35</a>
+<a id='n36' href='#n36'>36</a>
+<a id='n37' href='#n37'>37</a>
+<a id='n38' href='#n38'>38</a>
+<a id='n39' href='#n39'>39</a>
+<a id='n40' href='#n40'>40</a>
+<a id='n41' href='#n41'>41</a>
+<a id='n42' href='#n42'>42</a>
+<a id='n43' href='#n43'>43</a>
+<a id='n44' href='#n44'>44</a>
+<a id='n45' href='#n45'>45</a>
+<a id='n46' href='#n46'>46</a>
+<a id='n47' href='#n47'>47</a>
+<a id='n48' href='#n48'>48</a>
+<a id='n49' href='#n49'>49</a>
+<a id='n50' href='#n50'>50</a>
+<a id='n51' href='#n51'>51</a>
+<a id='n52' href='#n52'>52</a>
+<a id='n53' href='#n53'>53</a>
+<a id='n54' href='#n54'>54</a>
+<a id='n55' href='#n55'>55</a>
+<a id='n56' href='#n56'>56</a>
+<a id='n57' href='#n57'>57</a>
+<a id='n58' href='#n58'>58</a>
+<a id='n59' href='#n59'>59</a>
+<a id='n60' href='#n60'>60</a>
+<a id='n61' href='#n61'>61</a>
+<a id='n62' href='#n62'>62</a>
+<a id='n63' href='#n63'>63</a>
+<a id='n64' href='#n64'>64</a>
+<a id='n65' href='#n65'>65</a>
+<a id='n66' href='#n66'>66</a>
+<a id='n67' href='#n67'>67</a>
+<a id='n68' href='#n68'>68</a>
+<a id='n69' href='#n69'>69</a>
+<a id='n70' href='#n70'>70</a>
+<a id='n71' href='#n71'>71</a>
+<a id='n72' href='#n72'>72</a>
+<a id='n73' href='#n73'>73</a>
+<a id='n74' href='#n74'>74</a>
+<a id='n75' href='#n75'>75</a>
+<a id='n76' href='#n76'>76</a>
+<a id='n77' href='#n77'>77</a>
+<a id='n78' href='#n78'>78</a>
+<a id='n79' href='#n79'>79</a>
+<a id='n80' href='#n80'>80</a>
+<a id='n81' href='#n81'>81</a>
+<a id='n82' href='#n82'>82</a>
+<a id='n83' href='#n83'>83</a>
+<a id='n84' href='#n84'>84</a>
+<a id='n85' href='#n85'>85</a>
+<a id='n86' href='#n86'>86</a>
+<a id='n87' href='#n87'>87</a>
+<a id='n88' href='#n88'>88</a>
+<a id='n89' href='#n89'>89</a>
+<a id='n90' href='#n90'>90</a>
+<a id='n91' href='#n91'>91</a>
+<a id='n92' href='#n92'>92</a>
+<a id='n93' href='#n93'>93</a>
+<a id='n94' href='#n94'>94</a>
+<a id='n95' href='#n95'>95</a>
+<a id='n96' href='#n96'>96</a>
+<a id='n97' href='#n97'>97</a>
+<a id='n98' href='#n98'>98</a>
+<a id='n99' href='#n99'>99</a>
+<a id='n100' href='#n100'>100</a>
+<a id='n101' href='#n101'>101</a>
+<a id='n102' href='#n102'>102</a>
+<a id='n103' href='#n103'>103</a>
+<a id='n104' href='#n104'>104</a>
+<a id='n105' href='#n105'>105</a>
+<a id='n106' href='#n106'>106</a>
+<a id='n107' href='#n107'>107</a>
+<a id='n108' href='#n108'>108</a>
+<a id='n109' href='#n109'>109</a>
+<a id='n110' href='#n110'>110</a>
+<a id='n111' href='#n111'>111</a>
+<a id='n112' href='#n112'>112</a>
+<a id='n113' href='#n113'>113</a>
+<a id='n114' href='#n114'>114</a>
+<a id='n115' href='#n115'>115</a>
+<a id='n116' href='#n116'>116</a>
+<a id='n117' href='#n117'>117</a>
+<a id='n118' href='#n118'>118</a>
+<a id='n119' href='#n119'>119</a>
+<a id='n120' href='#n120'>120</a>
+</pre></td>
+<td class='lines'><pre><code>diff -uNr docker-0.12.0/archive/archive.go docker-0.12.0-1/archive/archive.go
--- docker-0.12.0/archive/archive.go 2014-06-05 20:59:19.000000000 -0400
+++ docker-0.12.0-1/archive/archive.go 2014-06-08 17:10:37.537530082 -0400
@@ -18,7 +18,7 @@
->>>>>>> 6034ed3... RHBZ#1105789 - upstream bump to 0.12.0
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
+ "archive/tar"
-<<<<<<< HEAD
- "io"
- "io/ioutil"
- "os"
-diff -uNr docker-0.11.1/archive/archive_test.go docker-0.11.1-1/archive/archive_test.go
---- docker-0.11.1/archive/archive_test.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/archive/archive_test.go 2014-05-12 11:13:46.713977937 -0400
-@@ -3,7 +3,7 @@
- import (
- "bytes"
- "fmt"
-- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
-+ "archive/tar"
- "io"
- "io/ioutil"
- "os"
-diff -uNr docker-0.11.1/archive/changes.go docker-0.11.1-1/archive/changes.go
---- docker-0.11.1/archive/changes.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/archive/changes.go 2014-05-12 11:13:37.413934009 -0400
-@@ -5,7 +5,7 @@
- "fmt"
-=======
)
type (
@@ -57,20 +187,10 @@ diff -uNr docker-0.12.0/archive/changes.go docker-0.12.0-1/archive/changes.go
+++ docker-0.12.0-1/archive/changes.go 2014-06-08 17:10:27.932544229 -0400
@@ -12,7 +12,7 @@
->>>>>>> 6034ed3... RHBZ#1105789 - upstream bump to 0.12.0
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
+ "archive/tar"
-<<<<<<< HEAD
- "io"
- "os"
- "path/filepath"
-diff -uNr docker-0.11.1/archive/diff.go docker-0.11.1-1/archive/diff.go
---- docker-0.11.1/archive/diff.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/archive/diff.go 2014-05-12 11:13:27.070884840 -0400
-@@ -2,7 +2,7 @@
-=======
)
type ChangeType int
@@ -80,25 +200,15 @@ diff -uNr docker-0.12.0/archive/diff.go docker-0.12.0-1/archive/diff.go
@@ -9,7 +9,7 @@
"strings"
"syscall"
->>>>>>> 6034ed3... RHBZ#1105789 - upstream bump to 0.12.0
- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
+ "archive/tar"
-<<<<<<< HEAD
- "io"
- "io/ioutil"
- "os"
-diff -uNr docker-0.11.1/archive/wrap.go docker-0.11.1-1/archive/wrap.go
---- docker-0.11.1/archive/wrap.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/archive/wrap.go 2014-05-12 11:14:03.103055123 -0400
-=======
)
// Linux device nodes are a bit weird due to backwards compat with 16 bit device nodes.
diff -uNr docker-0.12.0/archive/wrap.go docker-0.12.0-1/archive/wrap.go
--- docker-0.12.0/archive/wrap.go 2014-06-05 20:59:19.000000000 -0400
+++ docker-0.12.0-1/archive/wrap.go 2014-06-08 17:10:11.704568146 -0400
->>>>>>> 6034ed3... RHBZ#1105789 - upstream bump to 0.12.0
@@ -2,7 +2,7 @@
import (
@@ -108,15 +218,9 @@ diff -uNr docker-0.12.0/archive/wrap.go docker-0.12.0-1/archive/wrap.go
"io/ioutil"
)
-<<<<<<< HEAD
-diff -uNr docker-0.11.1/graph/tags_unit_test.go docker-0.11.1-1/graph/tags_unit_test.go
---- docker-0.11.1/graph/tags_unit_test.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/graph/tags_unit_test.go 2014-05-12 11:14:12.608099648 -0400
-=======
diff -uNr docker-0.12.0/graph/tags_unit_test.go docker-0.12.0-1/graph/tags_unit_test.go
--- docker-0.12.0/graph/tags_unit_test.go 2014-06-05 20:59:19.000000000 -0400
+++ docker-0.12.0-1/graph/tags_unit_test.go 2014-06-08 17:10:48.989513208 -0400
->>>>>>> 6034ed3... RHBZ#1105789 - upstream bump to 0.12.0
@@ -6,7 +6,7 @@
_ "github.com/dotcloud/docker/daemon/graphdriver/vfs" // import the vfs driver so it is used in the tests
"github.com/dotcloud/docker/image"
@@ -126,15 +230,9 @@ diff -uNr docker-0.12.0/graph/tags_unit_test.go docker-0.12.0-1/graph/tags_unit_
"io"
"os"
"path"
-<<<<<<< HEAD
-diff -uNr docker-0.11.1/integration/api_test.go docker-0.11.1-1/integration/api_test.go
---- docker-0.11.1/integration/api_test.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/integration/api_test.go 2014-05-12 11:14:32.203193162 -0400
-=======
diff -uNr docker-0.12.0/integration/api_test.go docker-0.12.0-1/integration/api_test.go
--- docker-0.12.0/integration/api_test.go 2014-06-05 20:59:19.000000000 -0400
+++ docker-0.12.0-1/integration/api_test.go 2014-06-08 17:10:58.148499687 -0400
->>>>>>> 6034ed3... RHBZ#1105789 - upstream bump to 0.12.0
@@ -21,7 +21,7 @@
"github.com/dotcloud/docker/image"
"github.com/dotcloud/docker/runconfig"
@@ -144,23 +242,6 @@ diff -uNr docker-0.12.0/integration/api_test.go docker-0.12.0-1/integration/api_
)
func TestGetEvents(t *testing.T) {
-<<<<<<< HEAD
-diff -uNr docker-0.11.1/integration/utils_test.go docker-0.11.1-1/integration/utils_test.go
---- docker-0.11.1/integration/utils_test.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/integration/utils_test.go 2014-05-12 11:14:23.329149517 -0400
-@@ -3,7 +3,7 @@
- import (
- "bytes"
- "fmt"
-- "github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
-+ "archive/tar"
- "io"
- "io/ioutil"
- "net/http"
-diff -uNr docker-0.11.1/utils/tarsum.go docker-0.11.1-1/utils/tarsum.go
---- docker-0.11.1/utils/tarsum.go 2014-05-07 20:29:56.000000000 -0400
-+++ docker-0.11.1-1/utils/tarsum.go 2014-05-12 11:14:41.322234586 -0400
-=======
diff -uNr docker-0.12.0/integration/utils_test.go docker-0.12.0-1/integration/utils_test.go
--- docker-0.12.0/integration/utils_test.go 2014-06-05 20:59:19.000000000 -0400
+++ docker-0.12.0-1/integration/utils_test.go 2014-06-08 17:11:10.725481190 -0400
@@ -176,7 +257,6 @@ diff -uNr docker-0.12.0/integration/utils_test.go docker-0.12.0-1/integration/ut
diff -uNr docker-0.12.0/utils/tarsum.go docker-0.12.0-1/utils/tarsum.go
--- docker-0.12.0/utils/tarsum.go 2014-06-05 20:59:19.000000000 -0400
+++ docker-0.12.0-1/utils/tarsum.go 2014-06-08 17:11:19.678468002 -0400
->>>>>>> 6034ed3... RHBZ#1105789 - upstream bump to 0.12.0
@@ -5,7 +5,7 @@
"compress/gzip"
"crypto/sha256"
@@ -198,3 +278,9 @@ diff -uNr docker-0.12.0/utils/tarsum_test.go docker-0.12.0-1/utils/tarsum_test.g
"io"
"io/ioutil"
"os"
+</code></pre></td></tr></table>
+</div> <!-- class=content -->
+<div class='footer'>generated by cgit v0.10.1 at 2014-06-09 15:19:42 (GMT)</div>
+</div> <!-- id=cgit -->
+</body>
+</html>
More information about the scm-commits
mailing list