merge Neon/unstable

Authored by jriddell on Dec 18 2017, 2:25 PM.

Description

merge Neon/unstable

Details

Committed
jriddellDec 18 2017, 2:25 PM
Parents
R577:379aa3e48d40: Merge branch 'Neon/stable' into Neon/unstable
R577:94346d90f49e: merge
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
379aa3e48d40D9397 jriddell
Merge branch 'Neon/stable' into Neon/unstable 
Dec 18 2017
95154b9482f0 jriddell
Merge branch 'Neon/release' into Neon/stable 
Dec 18 2017
85c316d9f1c1 jriddell
Merge branch 'Neon/release-lts' into Neon/release 
Dec 18 2017
f951bc19226eD9397apol/ jriddell
Add git shortcuts to neon images 
Dec 18 2017
33dc48376871 jriddell
Merge branch 'Neon/stable' into Neon/unstable 
Nov 16 2017
aca90f089124 jriddell
Merge branch 'Neon/release' into Neon/stable 
Nov 16 2017
9d3a28bd7521 jriddell
Merge branch 'Neon/release-lts' into Neon/release 
Nov 16 2017
ae4a71d3be46 jriddell
typo 
Nov 16 2017
7c12f6fa86d3 jriddell
Merge branch 'Neon/stable' into Neon/unstable 
Nov 14 2017
41c57dceb1d3 jriddell
Merge branch 'Neon/release' into Neon/stable 
Nov 14 2017
d5c5cb9cce13 jriddell
Merge branch 'Neon/release-lts' into Neon/release 
Nov 14 2017
2cbf16993143 jriddell
set shell env var 
Nov 14 2017
04feb97fb1a2 jriddell
Merge branch 'Neon/stable' into Neon/unstable 
Aug 3 2017
87a09b1e5097 jriddell
Merge branch 'Neon/release' into Neon/stable 
Aug 3 2017
5ba74e8c491d jriddell
Merge branch 'Neon/release-lts' into Neon/release 
Aug 3 2017
90e852cfbe4b jriddell
revert 
Aug 3 2017
50160bdd7c8a jriddell
Merge branch 'Neon/release-lts' into Neon/release 
Aug 3 2017
74771ad9672f jriddell
nah doesn't work 
Aug 3 2017
164fe2f5d8ac jriddell
Merge branch 'Neon/stable' into Neon/unstable 
Aug 3 2017
aab7a0f1ef69 jriddell
Merge branch 'Neon/release' into Neon/stable 
Aug 3 2017
834463bf8006 jriddell
Merge branch 'Neon/release-lts' into Neon/release 
Aug 3 2017
6490fe7c5dee jriddell
mildly more secure xhost 
Aug 3 2017
89eaee2a744f jriddell
merge 
May 10 2017
b12cfde6efea jriddell
Merge branch 'Neon/stable' into Neon/unstable 
May 10 2017
a45f0c4bc94a jriddell
fix sources 
May 10 2017
20ee624eb13c jriddell
Merge branch 'Neon/release' into Neon/stable 
May 10 2017
17a5234b650c jriddell
fix sources 
May 10 2017
97d5978c85a5 jriddell
Merge branch 'Neon/release-lts' into Neon/release 
May 10 2017
fa93bbe7acd7 jriddell
fix source 
May 10 2017
9617a59a25ce jriddell
fix 
May 10 2017
73fd0f785ade jriddell
fix 
May 10 2017
fb5d4d773499 jriddell
Merge branch 'Neon/unstable' into Neon/stable 
May 10 2017
c8d34a77dd7a jriddell
Merge branch 'Neon/release' into Neon/stable 
May 10 2017
40dd4012a801 jriddell
Merge branch 'Neon/release-lts' into Neon/release 
May 10 2017
2aed24f293af jriddell
syntax 
May 10 2017
0fadd7523917 jriddell
Merge branch 'Neon/stable' into Neon/unstable 
May 10 2017
aa22b7690e13 jriddell
Merge branch 'Neon/release' into Neon/stable 
May 10 2017
a95c50b499aa jriddell
Merge branch 'Neon/release-lts' into Neon/release 
May 10 2017
a66dc1d8b4bf jriddell
better workaround 
May 10 2017
d269a4432bea jriddell
Merge branch 'Neon/stable' into Neon/unstable 
May 10 2017
d98204e8329d jriddell
Merge branch 'Neon/release' into Neon/stable 
May 10 2017
599c6c77141c jriddell
Merge branch 'Neon/release-lts' into Neon/release 
May 10 2017
02536a8cb5bf jriddell
ubuntu minimal causing problems 
May 10 2017