summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use coreutils dd instead of busybox ddbaserock/franred/always-use-coreutils-ddFrancisco Redondo Marchena2015-02-121-0/+5
* Merge branch 'baserock/franred/fix-pam-sudo-error'Francisco Redondo Marchena2015-02-112-0/+14
|\
| * Fix error in linux-pam when try to run sudo commandbaserock/franred/fix-pam-sudo-errorFrancisco Redondo Marchena2015-02-112-0/+14
|/
* Merge branch 'baserock/jjardon/git230'Javier Jardón2015-02-111-2/+2
|\
| * strata/core: Upgrade git to latest stable (2.3.0)baserock/jjardon/git230Javier Jardón2015-02-111-2/+2
|/
* Update lorry-controller for branch sam/proxy-fixesSam Thursfield2015-02-111-1/+1
* Merge branch 'sam/more-python-core'Sam Thursfield2015-02-1110-0/+18
|\
| * Add python-core to build-systems and as a dep of MorphSam Thursfield2015-02-108-0/+15
| * Add python-core to Trove systems and as a dep of lorry-controllerSam Thursfield2015-02-102-0/+3
* | Merge branch 'baserock/pedroalvarez/dnsmasq-install-utils'Pedro Alvarez2015-02-111-2/+6
|\ \ | |/ |/|
| * dnsmasq.morph: Install also dhcp_release and dhcp_lease_timePedro Alvarez2015-02-111-2/+6
|/
* Merge branch 'sam/remove-old-mason-config'Sam Thursfield2015-02-102-3/+1
|\
| * Remove Mason configuration from example Trove clusterSam Thursfield2015-02-101-2/+0
| * Update trove-setup for branch sam/remove-mason-hookSam Thursfield2015-02-101-1/+1
|/
* Merge branch 'sam/requests-to-core'Sam Thursfield2015-02-103-13/+5
|\
| * Update python-requests to latest (v2.5.1)Sam Thursfield2015-02-101-2/+2
| * Move python-requests to 'python-core'Sam Thursfield2015-02-103-13/+5
|/
* Merge branch 'baserock/lauren/extlinux-in-build-systems'Sam Thursfield2015-02-104-0/+8
|\
| * Add extlinux to build systems to stop ./check tests failingLauren Perry2015-02-104-0/+8
* | Merge branch 'baserock/jjardon/linux_pam'Javier Jardón2015-02-103-14/+8
|\ \
| * | strata/weston-*: Remove PAM from herebaserock/jjardon/linux_pamJavier Jardón2015-02-102-14/+2
| * | strata/foundation: systemd's logind needs pam to workJavier Jardón2015-02-101-0/+6
* | | Merge remote-tracking branch 'origin/sam/timezone-data'Sam Thursfield2015-02-102-0/+16
|\ \ \ | |/ / |/| |
| * | Add time-zone-database to foundationSam Thursfield2015-02-042-0/+16
* | | Merge branch 'baserock/jjardon/weston1693'Javier Jardón2015-02-102-4/+4
|\ \ \
| * | | strata/weston-common: Upgrade weston to 1.7 rc2baserock/jjardon/weston1693Javier Jardón2015-02-101-2/+2
| * | | strata/wayland-generic: Upgrade wayland to 1.7 rc2 releaseJavier Jardón2015-02-101-2/+2
* | | | Merge branch 'baserock/richardipsum/python-pkg-shuffle'Richard Ipsum2015-02-1021-14/+58
|\ \ \ \ | |/ / / |/| | |
| * | | Remove pip and add virtualenvRichard Ipsum2015-02-101-4/+4
| * | | Make ceph get python-core rather than python-toolsRichard Ipsum2015-02-101-2/+2
| * | | Make devel-systems depend on python-coreRichard Ipsum2015-02-1017-0/+34
| * | | Move pbr into python-coreRichard Ipsum2015-02-102-8/+7
| * | | Add python-core stratumRichard Ipsum2015-02-101-0/+11
|/ / /
* | | Merge branch 'baserock/jjardon/libinput09'Javier Jardón2015-02-091-2/+2
|\ \ \
| * | | strata/input-common: Upgrade libinput to latest stable version (0.9.0)baserock/jjardon/libinput09Javier Jardón2015-02-041-2/+2
* | | | Merge branch 'jjardon/automake115'Javier Jardón2015-02-091-2/+2
|\ \ \ \
| * | | | strata/core.morph: Upgrade automake to latest stable (1.15)jjardon/automake115Javier Jardón2015-01-291-2/+2
* | | | | Merge branch 'baserock/jjardon/more_updates'Javier Jardón2015-02-063-5/+11
|\ \ \ \ \
| * | | | | strata/foundation.morph: Update fuse to latest stable branch: fuse_2_9_bugfixbaserock/jjardon/more_updatesJavier Jardón2015-02-061-2/+2
| * | | | | strata/tools: Upgrade to latest vala (0.26.2)Javier Jardón2015-02-062-3/+9
|/ / / / /
* | | | | Merge branch 'baserock/rdale/qt-creator-3.3.0'Richard Dale2015-02-061-2/+2
|\ \ \ \ \
| * | | | | Upgrade qt-creator to 3.3.0Richard Dale2015-02-061-2/+2
|/ / / / /
* | | | | Merge branch 'jjardon/baserock/sqlite'Javier Jardón2015-02-061-2/+2
|\ \ \ \ \
| * | | | | strata/core: Upgrade sqlite3 to 3.8.8.1jjardon/baserock/sqliteJavier Jardón2015-02-061-2/+2
|/ / / / /
* | | | | Merge branch 'baserock/jjardon/libusb'Javier Jardón2015-02-061-11/+12
|\ \ \ \ \
| * | | | | strata/foundation: Use libusb instead libusbxbaserorck/jjardon/libusbbaserock/jjardon/libusbJavier Jardón2015-02-041-11/+12
* | | | | | Merge branch 'baserock/jjardon/updated_autotools'Javier Jardón2015-02-069-72/+66
|\ \ \ \ \ \
| * | | | | | strata/core: Use git and upgrade pkg-config to latest (0.28)baserock/jjardon/updated_autotoolsJavier Jardón2015-02-022-7/+10
| * | | | | | strata/core: Upgrade xz to latest stable (5.2.0)Javier Jardón2015-02-022-6/+2
| * | | | | | strata/core: Upgrade libtool to latest tarball version (2.4.5)Javier Jardón2015-02-022-14/+13