[Buildbot-commits] [buildbot/buildbot] 2753fc: more explicit description of symbol styles

Thu Aug 15 20:41:49 UTC 2013

  Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: 2753fc4e79b0a530945d67f3272c287323c0756c
      https://github.com/buildbot/buildbot/commit/2753fc4e79b0a530945d67f3272c287323c0756c
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M master/docs/developer/style.rst

  Log Message:
  -----------
  more explicit description of symbol styles

  Commit: 47ef757bf9fa8244da7408c1e6af7f2d22e12372
      https://github.com/buildbot/buildbot/commit/47ef757bf9fa8244da7408c1e6af7f2d22e12372
  Author: ludovicchabant <ludovic at chabant.com>
  Date:   2013-05-07 (Tue, 07 May 2013)

  Changed paths:
    A master/buildbot/steps/mswin.py

  Log Message:
  -----------
  Added Windows-specific buildsteps module.
Right now it only contains a `Robocopy` step.

  Commit: bea09883783f56149fb978e1acfda2246b5b41da
      https://github.com/buildbot/buildbot/commit/bea09883783f56149fb978e1acfda2246b5b41da
  Author: ludovicchabant <ludovic at chabant.com>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    M master/buildbot/changes/p4poller.py

  Log Message:
  -----------
  Ability to specify a timezone for a P4 server

The Perforce server used with `P4Source` may be in a different time zone
than the Buildbot master, which would cause, for example, changes to be
displayed in the wrong place on the Waterfall display.

This change lets you specify a timezone for the server. Changelist times
will be converted from that timezone to the local timezone before being
added to the Buildbot master.

  Commit: 926badd856f863af4ef4b881ea76f413fe7de035
      https://github.com/buildbot/buildbot/commit/926badd856f863af4ef4b881ea76f413fe7de035
  Author: ludovicchabant <ludovic at chabant.com>
  Date:   2013-05-09 (Thu, 09 May 2013)

  Changed paths:
    M master/buildbot/steps/mswin.py

  Log Message:
  -----------
  Fixed Robocopy step status

Robocopy actually returns a combination of flags to indicate
success/warning/failure status.

  Commit: ff9404be98a7f2d4082fab0ac2a897dea2fc9090
      https://github.com/buildbot/buildbot/commit/ff9404be98a7f2d4082fab0ac2a897dea2fc9090
  Author: Ludovic Chabant <ludovic at chabant.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M master/buildbot/steps/mswin.py

  Log Message:
  -----------
  Added information about Robocopy exit codes.

  Commit: f3032198239393e66469d53b3d2753e2bbfd611c
      https://github.com/buildbot/buildbot/commit/f3032198239393e66469d53b3d2753e2bbfd611c
  Author: ludovicchabant <ludovic at chabant.com>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M master/docs/manual/cfg-buildsteps.rst

  Log Message:
  -----------
  Added documentation about Robocopy step.

  Commit: 41f865f110dd84a70a50196a775c226f2e39b5f1
      https://github.com/buildbot/buildbot/commit/41f865f110dd84a70a50196a775c226f2e39b5f1
  Author: Ludovic Chabant <ludovic at chabant.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M master/buildbot/steps/mswin.py

  Log Message:
  -----------
  Removed docstring for Robocopy step.

All usage information is only in the documentation page now.

  Commit: 6336819584472892651732e3e93a0d941ed5f1c7
      https://github.com/buildbot/buildbot/commit/6336819584472892651732e3e93a0d941ed5f1c7
  Author: Ludovic Chabant <ludovic at chabant.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M master/docs/manual/cfg-changesources.rst

  Log Message:
  -----------
  Documentation about timezone support in P4 changesource

  Commit: f915175d48680e49c4a09e4b020a61123b9b3c79
      https://github.com/buildbot/buildbot/commit/f915175d48680e49c4a09e4b020a61123b9b3c79
  Author: Ludovic Chabant <ludovic at chabant.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Release notes for Robocopy and P4 changes.

  Commit: 2bc2399d5ec2861ac8fda42402d73e55eedbb71a
      https://github.com/buildbot/buildbot/commit/2bc2399d5ec2861ac8fda42402d73e55eedbb71a
  Author: Ludovic Chabant <ludovic at chabant.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M master/buildbot/test/unit/test_steps_source_p4.py

  Log Message:
  -----------
  Fixed P4 source unit tests on Windows

This is because P4 normalizes slashes/backslashes, so we need to set our
expectations right.

  Commit: 13b870b7dbb071f70ab685992c18e4ff2efd4a96
      https://github.com/buildbot/buildbot/commit/13b870b7dbb071f70ab685992c18e4ff2efd4a96
  Author: Ludovic Chabant <ludovic at chabant.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M master/buildbot/steps/mswin.py
    A master/buildbot/test/unit/test_steps_mswin.py

  Log Message:
  -----------
  Added unit tests for Robocopy step.

Fixed whitespace.

  Commit: 8f2e82a1fe3d3cb8b64cc6c72178f429c5cebede
      https://github.com/buildbot/buildbot/commit/8f2e82a1fe3d3cb8b64cc6c72178f429c5cebede
  Author: Ludovic Chabant <ludovic at chabant.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M master/buildbot/steps/mswin.py
    M master/buildbot/test/unit/test_steps_mswin.py
    M master/docs/manual/cfg-buildsteps.rst

  Log Message:
  -----------
  Don't pass `/UNICODE` to Robocopy by default.

  Commit: 1800e21c86ef79d5616ed1f4c1db04dd1dadb10a
      https://github.com/buildbot/buildbot/commit/1800e21c86ef79d5616ed1f4c1db04dd1dadb10a
  Author: Ludovic Chabant <ludovic at chabant.com>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M master/docs/manual/cfg-buildsteps.rst

  Log Message:
  -----------
  Added more information about Robocopy in the docs.

  Commit: 3a563189374737aa2ebf3f6467bf461bc3ec5443
      https://github.com/buildbot/buildbot/commit/3a563189374737aa2ebf3f6467bf461bc3ec5443
  Author: Pierre Tardy <pierre.tardy at intel.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M master/buildbot/status/web/files/default.css
    M master/buildbot/status/web/logs.py

  Log Message:
  -----------
  logs: implement on the fly parsing of ansi code

grunt and js tools have the habit of using ansi
code a lot, which are ugly inside python log window.
http://en.wikipedia.org/wiki/ANSI_escape_code

This is a simple enough implementation of ansicode parser
which integrates well into buildbot's way of displaying logs

Signed-off-by: Pierre Tardy <pierre.tardy at intel.com>

  Commit: 99b38cd99afb854a52ecb579c2fb439a1d2291e9
      https://github.com/buildbot/buildbot/commit/99b38cd99afb854a52ecb579c2fb439a1d2291e9
  Author: Ludovic Chabant <ludovic at chabant.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M master/buildbot/test/unit/test_steps_source_p4.py

  Log Message:
  -----------
  Fixed 2.5 incompatibility in p4 tests

  Commit: 44c52eb4d83d56c0195a94478ccd7b4fa072ed59
      https://github.com/buildbot/buildbot/commit/44c52eb4d83d56c0195a94478ccd7b4fa072ed59
  Author: Ludovic Chabant <ludovic at chabant.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M master/buildbot/test/unit/test_changes_p4poller.py

  Log Message:
  -----------
  Fixed p4 poller tests

  Commit: 45430e1e670b9cd43666f4bf6e6c1f2a30733255
      https://github.com/buildbot/buildbot/commit/45430e1e670b9cd43666f4bf6e6c1f2a30733255
  Author: Роман Донченко <dpb at corrigendum.ru>
  Date:   2013-07-20 (Sat, 20 Jul 2013)

  Changed paths:
    M slave/contrib/init-scripts/buildslave.init.sh

  Log Message:
  -----------
  Fix buildslave init script errors saying "buildmaster"

Also, change ${i} to ${index} for consistency with surrounding code.

  Commit: 28ddd095e3295ec9d74b3fe56ac77a3e782f4958
      https://github.com/buildbot/buildbot/commit/28ddd095e3295ec9d74b3fe56ac77a3e782f4958
  Author: Kevin Funk <kevin.funk at kdab.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M master/buildbot/revlinks.py
    M master/buildbot/test/unit/test_revlinks.py

  Log Message:
  -----------
  Add RevlinkMatch for new SourceForge platform

Also add tests

  Commit: 38ee978cc0e5a9e1e9eda5ef80f0e56fcf9a80ab
      https://github.com/buildbot/buildbot/commit/38ee978cc0e5a9e1e9eda5ef80f0e56fcf9a80ab
  Author: Kevin Funk <kevin.funk at kdab.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M master/buildbot/test/unit/test_revlinks.py

  Log Message:
  -----------
  Improve coverage: Add test for RevlinkMultiplexer

  Commit: 5c5c2961cb94b3ce44be77e4e9ba26bc4d9b02e0
      https://github.com/buildbot/buildbot/commit/5c5c2961cb94b3ce44be77e4e9ba26bc4d9b02e0
  Author: Kevin Funk <kevin.funk at kdab.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M master/buildbot/status/words.py

  Log Message:
  -----------
  Minor: Improve debugging output in words.py

  Commit: d99f53b0f5a32caa0a79817657fc2be8f09bea54
      https://github.com/buildbot/buildbot/commit/d99f53b0f5a32caa0a79817657fc2be8f09bea54
  Author: Elmir Jagudin <elmir at axis.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M common/pylintrc

  Log Message:
  -----------
  new pylint configuration

 * disable all currently reported messages
 * document checks that we don't care about
 * tweaked symbol name regexps to match buildbot's style

  Commit: 8e01ed68c1ae84c2345e79d4b6be076865e4e8ed
      https://github.com/buildbot/buildbot/commit/8e01ed68c1ae84c2345e79d4b6be076865e4e8ed
  Author: Kálmán Viktor <viktorvector at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    A master/buildbot/status/web/hooks/gitorious.py

  Log Message:
  -----------
  gitorious change hook dialect

  Commit: 1302fc6941cb10e3cb9b450ec84296027140c53d
      https://github.com/buildbot/buildbot/commit/1302fc6941cb10e3cb9b450ec84296027140c53d
  Author: Kálmán Viktor <viktorvector at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    A master/buildbot/test/unit/test_status_web_hooks_gitorious.py

  Log Message:
  -----------
  gitorious test cases

  Commit: 6f4f3e48b09d7ee2a3a234e8e713c214087d7c98
      https://github.com/buildbot/buildbot/commit/6f4f3e48b09d7ee2a3a234e8e713c214087d7c98
  Author: Kálmán Viktor <viktorvector at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M master/docs/manual/cfg-statustargets.rst

  Log Message:
  -----------
  gitorious web hook docs

  Commit: 3e741154f7dfccbce33d2109c3b6f2b9c069fbdf
      https://github.com/buildbot/buildbot/commit/3e741154f7dfccbce33d2109c3b6f2b9c069fbdf
  Author: Srinu P <srinupiits at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M master/buildbot/process/buildstep.py
    M master/buildbot/test/unit/test_process_buildstep.py

  Log Message:
  -----------
  Buildbot interrupts master-side source steps. Fixes #2356

  Commit: 5955deb57d7b352b7c259837fcb2452e7e97226f
      https://github.com/buildbot/buildbot/commit/5955deb57d7b352b7c259837fcb2452e7e97226f
  Author: Kálmán Viktor <viktorvector at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M master/buildbot/status/web/hooks/gitorious.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  removed docstrings from gitorious.py and added relnotes

  Commit: 7f472e329d8bf9d3abdf17b6d239afbe014c2f7f
      https://github.com/buildbot/buildbot/commit/7f472e329d8bf9d3abdf17b6d239afbe014c2f7f
  Author: Buck Golemon <buck at yelp.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  tweak gitignore of vim swap files

  Commit: efd0d6a14683df2a0e08601da7dea5771fb18c6d
      https://github.com/buildbot/buildbot/commit/efd0d6a14683df2a0e08601da7dea5771fb18c6d
  Author: Srinu P <srinupiits at gmail.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_steps_source_git.py

  Log Message:
  -----------
  Fix StrictVersion issue

  Commit: e359d0026c223520df79096bc934c0e37fb0ba43
      https://github.com/buildbot/buildbot/commit/e359d0026c223520df79096bc934c0e37fb0ba43
  Author: Olof Johansson <olofjn at axis.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M master/buildbot/process/build.py
    M master/buildbot/test/unit/test_process_build.py

  Log Message:
  -----------
  builddir and workdir properties should be strings, not tuples

  Commit: dbdc3293cd8f339a66f9cdb19d0aaf7bbc73f668
      https://github.com/buildbot/buildbot/commit/dbdc3293cd8f339a66f9cdb19d0aaf7bbc73f668
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_steps_source_git.py

  Log Message:
  -----------
  Merge branch 'bug2504-1' of git://github.com/srinupiits/buildbot

  Commit: f465a19a69530ffb11e2238e3e2b1b060353e0aa
      https://github.com/buildbot/buildbot/commit/f465a19a69530ffb11e2238e3e2b1b060353e0aa
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M master/buildbot/steps/mswin.py
    M master/buildbot/test/unit/test_changes_p4poller.py
    M master/buildbot/test/unit/test_steps_mswin.py
    M master/buildbot/test/unit/test_steps_source_p4.py

  Log Message:
  -----------
  fix bugs in handling unkown return codes, pyflakes

..and return Deferreds from test methods.

  Commit: 86d8ba49c19a4099a30fe0584cc0419fc1afadff
      https://github.com/buildbot/buildbot/commit/86d8ba49c19a4099a30fe0584cc0419fc1afadff
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M master/buildbot/changes/p4poller.py
    A master/buildbot/steps/mswin.py
    M master/buildbot/test/unit/test_changes_p4poller.py
    A master/buildbot/test/unit/test_steps_mswin.py
    M master/buildbot/test/unit/test_steps_source_p4.py
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-changesources.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'pull728'

  Commit: a5dbf75b8e615c6d05e6fe0b8e6d5a1f8f35e037
      https://github.com/buildbot/buildbot/commit/a5dbf75b8e615c6d05e6fe0b8e6d5a1f8f35e037
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M common/pylintrc

  Log Message:
  -----------
  Merge branch 'pylint' of git://github.com/elmirjagudin/buildbot

  Commit: d6bf7573cd3d182dc1f169206b38171e8a5660f6
      https://github.com/buildbot/buildbot/commit/d6bf7573cd3d182dc1f169206b38171e8a5660f6
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M slave/contrib/init-scripts/buildslave.init.sh

  Log Message:
  -----------
  Merge branch 'slave-not-master' of git://github.com/SpecLad/buildbot

  Commit: 5584042f8a0e398c0ad597ed40cdc61341333042
      https://github.com/buildbot/buildbot/commit/5584042f8a0e398c0ad597ed40cdc61341333042
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M master/docs/developer/style.rst

  Log Message:
  -----------
  Merge branch 'symbol-style' of git://github.com/djmitche/buildbot

  Commit: 15dd0f1805cd514d6fbc47bb56bde808d8eb01db
      https://github.com/buildbot/buildbot/commit/15dd0f1805cd514d6fbc47bb56bde808d8eb01db
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M master/buildbot/revlinks.py
    M master/buildbot/test/unit/test_revlinks.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'add-sourceforge_allura-revlinkmatch' of git://github.com/krf/buildbot

  Commit: 7d6df157dd284c8b655becaedb90cf137cd97dd7
      https://github.com/buildbot/buildbot/commit/7d6df157dd284c8b655becaedb90cf137cd97dd7
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M master/buildbot/status/words.py

  Log Message:
  -----------
  Merge branch 'small-fixes' of git://github.com/krf/buildbot

  Commit: c94cd9abb0a166d71cc73953ccec589b67bc2e81
      https://github.com/buildbot/buildbot/commit/c94cd9abb0a166d71cc73953ccec589b67bc2e81
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M master/buildbot/status/web/files/default.css
    M master/buildbot/status/web/logs.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'ansicodes' of git://github.com/tardyp/buildbot

  Commit: d04cd8bee344244333d5b6205db28077c1cbddcd
      https://github.com/buildbot/buildbot/commit/d04cd8bee344244333d5b6205db28077c1cbddcd
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M master/buildbot/process/buildstep.py
    M master/buildbot/test/unit/test_process_buildstep.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'bug2356-1' of git://github.com/srinupiits/buildbot

  Commit: 517d485a54552d165f970941330cab620a36d0a4
      https://github.com/buildbot/buildbot/commit/517d485a54552d165f970941330cab620a36d0a4
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    A master/buildbot/status/web/hooks/gitorious.py
    A master/buildbot/test/unit/test_status_web_hooks_gitorious.py
    M master/docs/manual/cfg-statustargets.rst
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'buildbot-gitorious-hook' of git://github.com/kviktor/buildbot

Conflicts:
	master/docs/relnotes/index.rst

  Commit: 016178a600c019c4e0f42f2461713882dbe7368a
      https://github.com/buildbot/buildbot/commit/016178a600c019c4e0f42f2461713882dbe7368a
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Merge branch 'master-buck' of git://github.com/bukzor/buildbot

  Commit: 0cb82385e761fdfe7b5027f67544fafa986d3397
      https://github.com/buildbot/buildbot/commit/0cb82385e761fdfe7b5027f67544fafa986d3397
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M master/buildbot/process/buildrequestdistributor.py
    M master/buildbot/test/unit/test_process_buildrequestdistributor_BuildRequestDistributor.py

  Log Message:
  -----------
  Merge branch 'buck-silent-nextBuild' of git://github.com/bukzor/buildbot

  Commit: f50722369168085235c795cd7997abc07a790c7c
      https://github.com/buildbot/buildbot/commit/f50722369168085235c795cd7997abc07a790c7c
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M master/buildbot/process/build.py
    M master/buildbot/test/unit/test_process_build.py

  Log Message:
  -----------
  Merge branch 'fix/dont_tuplify_builddir' of git://github.com/olof/buildbot

  Commit: 92b12b4bb33b2ad402d141ed2909dc6521e1cdc7
      https://github.com/buildbot/buildbot/commit/92b12b4bb33b2ad402d141ed2909dc6521e1cdc7
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M master/buildbot/test/fake/fakedb.py
    M master/buildbot/test/unit/test_db_buildrequests.py

  Log Message:
  -----------
  Merge branch 'buck-modernize-test-db-buildrequests' of git://github.com/bukzor/buildbot

(with tabs -> spaces)

  Commit: 344d85983a17c7571672135dc4da57f72f4dc5b2
      https://github.com/buildbot/buildbot/commit/344d85983a17c7571672135dc4da57f72f4dc5b2
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-10 (Sat, 10 Aug 2013)

  Changed paths:
    M master/buildbot/steps/package/rpm/rpmlint.py

  Log Message:
  -----------
  Keep the config arguments for RPMLint

Based on the patch in https://bugzilla.redhat.com/show_bug.cgi?id=836624

  Commit: bde326cbc283ea0d57c44a08d938d3f0e08b4244
      https://github.com/buildbot/buildbot/commit/bde326cbc283ea0d57c44a08d938d3f0e08b4244
  Author: Buck Golemon <buck at yelp.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M master/buildbot/test/unit/test_status_github.py

  Log Message:
  -----------
  assert statements are bad, mkay?

  Commit: ca5353e458b25ceb19402f47ca564532a9ba513e
      https://github.com/buildbot/buildbot/commit/ca5353e458b25ceb19402f47ca564532a9ba513e
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M master/buildbot/test/unit/test_status_github.py

  Log Message:
  -----------
  Merge branch 'buck-fix-github' of git://github.com/bukzor/buildbot

  Commit: 393be2a31d6cac5eb3ddf2de431bb21b477984fc
      https://github.com/buildbot/buildbot/commit/393be2a31d6cac5eb3ddf2de431bb21b477984fc
  Author: llloret <luislloret at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M master/buildbot/status/web/templates/waterfallhelp.html
    M master/buildbot/status/web/waterfall.py

  Log Message:
  -----------
  Possibility to select categories to show in waterfall help

  Commit: bdb06f054dba41fdf938317d18dacaa7982c5e7c
      https://github.com/buildbot/buildbot/commit/bdb06f054dba41fdf938317d18dacaa7982c5e7c
  Author: llloret <luislloret at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Added comment in release notes

  Commit: 0ebd2051141932c892f9ef2115034001382a88d8
      https://github.com/buildbot/buildbot/commit/0ebd2051141932c892f9ef2115034001382a88d8
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M master/buildbot/status/web/templates/waterfallhelp.html
    M master/buildbot/status/web/waterfall.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge branch 'show_categories_in_waterfallhelp' of git://github.com/llloret/buildbot

  Commit: 02e9dfcf051418a7d8ca16b81f3180e530bd575c
      https://github.com/buildbot/buildbot/commit/02e9dfcf051418a7d8ca16b81f3180e530bd575c
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M .gitignore
    M common/pylintrc
    M master/buildbot/changes/p4poller.py
    M master/buildbot/process/build.py
    M master/buildbot/process/buildstep.py
    M master/buildbot/revlinks.py
    M master/buildbot/status/web/files/default.css
    A master/buildbot/status/web/hooks/gitorious.py
    M master/buildbot/status/web/logs.py
    M master/buildbot/status/web/templates/waterfallhelp.html
    M master/buildbot/status/web/waterfall.py
    M master/buildbot/status/words.py
    A master/buildbot/steps/mswin.py
    M master/buildbot/steps/package/rpm/rpmlint.py
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_changes_p4poller.py
    M master/buildbot/test/unit/test_db_buildrequests.py
    M master/buildbot/test/unit/test_process_build.py
    M master/buildbot/test/unit/test_process_buildstep.py
    M master/buildbot/test/unit/test_revlinks.py
    M master/buildbot/test/unit/test_status_github.py
    A master/buildbot/test/unit/test_status_web_hooks_gitorious.py
    A master/buildbot/test/unit/test_steps_mswin.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/buildbot/test/unit/test_steps_source_p4.py
    M master/docs/developer/style.rst
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-changesources.rst
    M master/docs/manual/cfg-statustargets.rst
    M master/docs/relnotes/index.rst
    M slave/contrib/init-scripts/buildslave.init.sh

  Log Message:
  -----------
  Merge branch 'master' into nine

Conflicts:
	master/buildbot/changes/p4poller.py
	master/buildbot/test/unit/test_changes_p4poller.py
	master/buildbot/test/unit/test_db_buildrequests.py

Compare: https://github.com/buildbot/buildbot/compare/61e776849bbd...02e9dfcf0514