baserock/baserock/morph.git - Morph -- Baserock build tool

	Commit message (Expand)	Author	Age	Files	Lines
*	Add deployment plugin	Lars Wirzenius	2013-02-06	4	-1/+203
*	Merge remote-tracking branch 'remotes/origin/samthursfield/drive-by-fixes'	Lars Wirzenius	2013-02-06	4	-45/+18
\|\
\| *	Remove deprecated functions	Sam Thursfield	2013-02-06	1	-24/+0
\| *	Avoid confusing error when staging area is empty	Sam Thursfield	2013-02-06	1	-2/+3
\| *	Tidy up create_cachedir()	Sam Thursfield	2013-02-06	2	-19/+15
* \|	Merge branch 'master' of git://git.baserock.org/baserock/baserock/morph	Lars Wirzenius	2013-02-06	9	-114/+153
\|\ \ \| \|/
\| *	Merge branch 'liw/soft-pyyaml-dep'	Sam Thursfield	2013-01-29	7	-112/+151
\| \|\
\| \| *	Make yaml be an optional dependency	Lars Wirzenius	2013-01-29	7	-111/+151
\| * \|	scripts/bootstrap: Fix eglibc2 build	Sam Thursfield	2013-01-29	1	-1/+1
\| * \|	Fix copyright year	Sam Thursfield	2013-01-29	1	-1/+1
* \| \|	Merge branch 'master' of git://git.baserock.org/baserock/baserock/morph	Lars Wirzenius	2013-01-29	1	-2/+3
\|\ \ \ \| \|/ / \| \| / \| \|/ \|/\|
\| *	Merge branch 'samthursfield/no-distcc'	Sam Thursfield	2013-01-29	1	-2/+3
\| \|\ \|/ /
\| *	Disable distcc by default	Sam Thursfield	2013-01-29	1	-2/+3
\|/
*	Fix cwd parsing in setup.py	Lars Wirzenius	2013-01-29	1	-1/+2
*	Merge branch 'jjardon/yaml-v2'	Sam Thursfield	2013-01-28	18	-129/+314
\|\
\| *	Remove unneded json module imports	Javier Jardón	2013-01-28	4	-9/+3
\| *	Change build tests to use YAML morphologies	Javier Jardón	2013-01-28	5	-96/+64
\| *	Fix tests	Richard Maw	2013-01-22	3	-5/+89
\| *	Parse as YAML if not valid JSON	Richard Maw	2013-01-22	5	-9/+147
\| *	Move OrderedDict and json loading to morphlib.util	Richard Maw	2013-01-22	2	-11/+12
* \|	Merge remote-tracking branch 'origin/baserock/richardmaw/morph-version'	Lars Wirzenius	2013-01-28	7	-7/+216
\|\ \
\| * \|	Add regression test for metadata including version	Richard Maw	2013-01-28	2	-0/+100
\| * \|	Include morph-version in artifact metadata	Richard Maw	2013-01-28	1	-0/+7
\| * \|	Make morph get its version from git.	Richard Maw	2013-01-28	4	-7/+109
\| \|/
* \|	Merge remote-tracking branch 'origin/baserock/richardmaw/temp-build-ref-commi...	Lars Wirzenius	2013-01-28	2	-3/+61
\|\ \
\| * \|	Add test for committed removes being tracked	Richard Maw	2013-01-25	1	-0/+56
\| * \|	Make temporary build refs count changes against HEAD	Richard Maw	2013-01-25	1	-3/+4
\| \|/
* \|	Fix copyright year	Sam Thursfield	2013-01-28	1	-1/+1
* \|	Merge remote-tracking branch 'origin/samthursfield/build-essential'	Lars Wirzenius	2013-01-28	2	-0/+558
\|\ \ \| \|/ \|/\|
\| *	Run ldconfig after populating staging chroot	Sam Thursfield	2013-01-24	1	-0/+3
\| *	Add script to manually create a build-essential staging filler	Sam Thursfield	2013-01-24	1	-0/+553
\|/
*	Remove scripts/clean-git-cache	Sam Thursfield	2013-01-22	1	-240/+0
*	Merge branch 'baserock/richardmaw/fix-morph-check-on-squeeze'	Richard Maw	2013-01-22	3	-0/+42
\|\
\| *	Reinstate check for python 2.7	Richard Maw	2013-01-22	2	-0/+6
\| *	Revert "Remove unneded scripts/python-check script"	Richard Maw	2013-01-22	1	-0/+36
\|/
*	Fix copyright years	Sam Thursfield	2013-01-22	4	-4/+4
*	Merge branch 'samthursfield/branch-fixes'	Sam Thursfield	2013-01-22	11	-47/+4
\|\
\| *	Remove needless git output from test result	Sam Thursfield	2013-01-22	2	-14/+4
\| *	Rename morph tag tests to follow pattern	Sam Thursfield	2013-01-22	9	-0/+0
\| *	Remove superfluous test	Sam Thursfield	2013-01-22	2	-33/+0
\|/
*	Merge branch 'jjardon/python_compatibility_fixes' of ssh://git.baserock.org/b...	Richard Maw	2013-01-21	25	-173/+64
\|\
\| *	Remove unneded scripts/python-check script	Javier Jardón	2013-01-18	1	-36/+0
\| *	tests.merging/*: Remove check to run only the teset with Python 2.7	Javier Jardón	2013-01-18	6	-18/+0
\| *	tests.branching/*: Remove check to run only the teset with Python 2.7	Javier Jardón	2013-01-18	6	-18/+0
\| *	tests.as-root/*: Remove check to run only the teset with Python 2.7	Javier Jardón	2013-01-18	9	-25/+0
\| *	morph2_tests: checks for python2.7 are not needed anymore	Javier Jardón	2013-01-18	1	-33/+27
\| *	morph2: Improve compatibility with python < 2.7	Javier Jardón	2013-01-18	1	-20/+9
\|/
*	Merge remote-tracking branch 'origin/jonathanmaw/ccache-local-fix'	Lars Wirzenius	2013-01-03	2	-5/+16
\|\
\| *	Make ccache use the same directory for repos that are clones	Jonathan Maw	2013-01-03	1	-4/+15
* \|	Merge remote-tracking branch 'origin/samthursfield/stable-glob'	Lars Wirzenius	2013-01-03	1	-2/+2
\|\ \ \| \|/ \|/\|