lp:~natefinch/juju-core/jameinel-1.18-panic-parsing-jenv-1312136

Created by Nate Finch and last modified
Get this branch:
bzr branch lp:~natefinch/juju-core/jameinel-1.18-panic-parsing-jenv-1312136
Only Nate Finch can upload to this branch. If you are Nate Finch please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Nate Finch
Project:
juju-core
Status:
Development

Recent revisions

2281. By Nate Finch

merge from trunk and fix conflicts

2280. By Nate Finch

make sure we only warn on non-nil errors

2279. By Nate Finch

fix build and tests

2278. By Nate Finch

refactor a little bit to make the code easier to read, and make sure we handle *all* errors

2277. By John A Meinel

moving the error vars into the blocks that use them allows the compiler to notice that we weren't using err before

2276. By John A Meinel

Add a test that would panic() without it, but at least asserts we get a proper err

2275. By John A Meinel

turn the Debugf into a Warningf so that users have a chance to know that their config is broken.

2274. By John A Meinel

actually handle config.New errors. (bug #1312136)

If there was an error parsing foo.jenv it was getting ignored and causing a panic
later on. This removes the panic and logs the error.

2273. By Curtis Hovey

[r=jameinel] Increment juju stable to 1.18.2

Increment juju stable version and win installer to 1.18.2.

https://codereview.appspot.com/87120043/

2272. By John A Meinel

[r=jameinel] testing/filetesting: preserve bzr file-ids

filetesting was backported from trunk to 1.18 using diff+patch rather than a bzr merge that would preserve its file identifiers. That means that when merging from 1.18 => trunk all those files look like duplicated files. This patch just fixes up the Bazaar indentifiers so that they match, which should allow easier merging between 1.18 and trunk in the future.

As this is a metadata only change (no code changes), I'm going to self approve this.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:~go-bot/juju-core/trunk
This branch contains Public information 
Everyone can see this information.

Subscribers