Snapcraft

Merge lp:~sergiusens/snapcraft/0.2-framework-policies into lp:~snappy-dev/snapcraft/core

  1. 0.2-framework-policies
  2. Merge into core
Proposed by Sergio Schvezov
Status: Superseded
Proposed branch: lp:~sergiusens/snapcraft/0.2-framework-policies
Merge into: lp:~snappy-dev/snapcraft/core
Diff against target: 26 lines (+10/-0) (has conflicts)
1 file modified
debian/changelog (+10/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~sergiusens/snapcraft/0.2-framework-policies
Reviewer Review Type Date Requested Status
Snappy Developers Pending
Review via email: mp+272886@code.launchpad.net

Commit message

Backport rev 221 from trunk: Support framework policies

To post a comment you must log in.
lp:~sergiusens/snapcraft/0.2-framework-policies updated
210. By Sergio Schvezov

Backport rev 221 from trunk: Support framework policies

Unmerged revisions

210. By Sergio Schvezov

Backport rev 221 from trunk: Support framework policies

209. By Sergio Schvezov

Releasing 0.2.1

208. By Sergio Schvezov

Backporting lp:snapcraft revision 208

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-09-25 10:46:37 +0000
3+++ debian/changelog 2015-09-30 09:45:18 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 snapcraft (0.3) UNRELEASED; urgency=medium
7
8 *
9@@ -14,6 +15,15 @@
10
11 -- Daniel Holbach <daniel.holbach@ubuntu.com> Thu, 24 Sep 2015 11:37:36 +0200
12
13+=======
14+snapcraft (0.2.1) wily; urgency=medium
15+
16+ * Create valid sources if geoip fails and allow to use the local
17+ sources by exporting SNAPCRAFT_LOCAL_SOURCES into the env (LP: #1499158).
18+
19+ -- Sergio Schvezov <sergio.schvezov@canonical.com> Thu, 24 Sep 2015 11:08:57 -0300
20+
21+>>>>>>> MERGE-SOURCE
22 snapcraft (0.2) wily; urgency=medium
23
24 * Better setuptools support:
25
26=== modified file 'integration-tests/units/jobs.pxu'

Subscribers

People subscribed via source and target branches