Branch: refs/heads/nine
  Home:   https://github.com/buildbot/buildbot
  Commit: 3e18d07114e4c22d3d94c757ff41295c58ec9cec
      
https://github.com/buildbot/buildbot/commit/3e18d07114e4c22d3d94c757ff41295c58ec9cec
  Author: Jonas Pommerening <[email protected]>
  Date:   2014-02-26 (Wed, 26 Feb 2014)

  Changed paths:
    M master/buildbot/status/logfile.py
    M master/buildbot/status/web/logs.py

  Log Message:
  -----------
  Make HTMLLogFile extend LogFile.

If logfiles were pickled with the "html" property and fake an open
logfile. Allow specifying a maximum size for logfiles to be embedded
in the pickles, otherwise just use the mechanism provided by LogFile.


  Commit: 208913e3b02100cb685016fe274d877e42ce1773
      
https://github.com/buildbot/buildbot/commit/208913e3b02100cb685016fe274d877e42ce1773
  Author: Jonas Pommerening <[email protected]>
  Date:   2014-02-26 (Wed, 26 Feb 2014)

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

  Log Message:
  -----------
  keep html property for small logfiles


  Commit: e654dfcaecafe1c5a22786f7952cca18087704df
      
https://github.com/buildbot/buildbot/commit/e654dfcaecafe1c5a22786f7952cca18087704df
  Author: Jonas Pommerening <[email protected]>
  Date:   2014-02-26 (Wed, 26 Feb 2014)

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

  Log Message:
  -----------
  fixed my indentation

That's it, I'll add it as a pre-commit hook


  Commit: bb94c005166fdf81c65888c4f9e20e48b51e25e9
      
https://github.com/buildbot/buildbot/commit/bb94c005166fdf81c65888c4f9e20e48b51e25e9
  Author: Jonas Pommerening <[email protected]>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M common/validate.sh
    M master/buildbot/buildslave/base.py
    M master/buildbot/db/enginestrategy.py
    M master/buildbot/db/model.py
    M master/buildbot/process/build.py
    M master/buildbot/process/buildstep.py
    M master/buildbot/process/remotecommand.py
    M master/buildbot/scripts/runner.py
    M master/buildbot/status/builder.py
    M master/buildbot/status/github.py
    M master/buildbot/status/logfile.py
    M master/buildbot/status/web/buildstatus.py
    M master/buildbot/status/web/console.py
    M master/buildbot/status/web/pngstatus.py
    M master/buildbot/status/web/status_json.py
    M master/buildbot/status/web/templates/console.html
    M master/buildbot/status/web/templates/layout.html
    M master/buildbot/status/web/templates/logs.html
    M master/buildbot/steps/slave.py
    M master/buildbot/steps/source/repo.py
    M master/buildbot/test/fake/fakebuild.py
    M master/buildbot/test/fake/fakedb.py
    M master/buildbot/test/fake/fakemaster.py
    M master/buildbot/test/fake/remotecommand.py
    M master/buildbot/test/fake/slave.py
    A master/buildbot/test/integration/test_custom_buildstep.py
    R master/buildbot/test/interfaces/test_remotecommand.py
    M master/buildbot/test/unit/test_buildslave_base.py
    M master/buildbot/test/unit/test_process_build.py
    M master/buildbot/test/unit/test_process_buildstep.py
    A master/buildbot/test/unit/test_process_remotecommand.py
    M master/buildbot/test/unit/test_schedulers_timed_NightlyBase.py
    M master/buildbot/test/unit/test_status_web_statuspng.py
    M master/buildbot/test/unit/test_steps_slave.py
    M master/buildbot/test/unit/test_steps_transfer.py
    M master/buildbot/test/util/steps.py
    M master/contrib/github_buildbot.py
    M master/docs/conf.py
    M master/docs/developer/cls-buildsteps.rst
    M master/docs/developer/master-slave.rst
    M master/docs/manual/cfg-builders.rst
    M master/docs/manual/cfg-buildsteps.rst
    M master/docs/manual/cfg-properties.rst
    M master/docs/manual/cfg-statustargets.rst
    M master/docs/manual/customization.rst
    M master/docs/manual/index.rst
    A master/docs/manual/new-style-steps.rst
    M master/docs/relnotes/index.rst
    M slave/buildslave/commands/fs.py
    M slave/buildslave/commands/registry.py
    M slave/buildslave/test/unit/test_commands_fs.py

  Log Message:
  -----------
  Merge branch 'master' into html-logs-in-pickles

* master: (47 commits)
  Fix docs/conf.py to work with sphinx-1.2.2
  pep8
  be sure run() returns a status and doesn't call finished or failed
  warn on use of old-style log methods in new-style steps
  prohibit use of step.step_status in new-style steps
  add step.*Statistic methods for new-style steps
  add docs for setStateStrings
  add step.setStateStrings
  backport ShellMixin and CommandMixin from nine
  cmd.add* return deferreds
  return deferreds from addHTMLLog and addURL
  return deferreds from addLog, addCompleteLog, and log.add*
  update docs for statuspng
  fix pngstatus test
  png status by revision hash
  fix pngstatus if the build is currently in progress
  Docs: add an 'import' in one spot to make the recipe easier to swallow
  fix docs regarding removal of LoggingBuildStep
  Fix w3c validator issues.
  Fix w3c validator issues.
  ...


  Commit: 3a634b25c58faa4d5497e1dec291d921fc226c6e
      
https://github.com/buildbot/buildbot/commit/3a634b25c58faa4d5497e1dec291d921fc226c6e
  Author: Jonas Pommerening <[email protected]>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M master/buildbot/status/logfile.py
    M master/buildbot/test/unit/test_status_logfile.py

  Log Message:
  -----------
  Stub out tests


  Commit: 2027f329422f245f5f98596c645716b6d0376ed4
      
https://github.com/buildbot/buildbot/commit/2027f329422f245f5f98596c645716b6d0376ed4
  Author: Jonas Pommerening <[email protected]>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M master/buildbot/status/logfile.py
    M master/buildbot/test/unit/test_status_logfile.py

  Log Message:
  -----------
  implement some tests


  Commit: 9f73985cffff3cfc1466ea64a944d0f66cfc22e5
      
https://github.com/buildbot/buildbot/commit/9f73985cffff3cfc1466ea64a944d0f66cfc22e5
  Author: Jonas Pommerening <[email protected]>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M master/buildbot/status/logfile.py
    M master/buildbot/test/unit/test_status_logfile.py

  Log Message:
  -----------
  Store all new logs in files.

Embedding smaller logs in the pickle was a stupid idea.


  Commit: 357ae0860072bd1f20eee11b41d501b1f851c381
      
https://github.com/buildbot/buildbot/commit/357ae0860072bd1f20eee11b41d501b1f851c381
  Author: Jonas Pommerening <[email protected]>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

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

  Log Message:
  -----------
  fixed the cleanup-gone-wrong


  Commit: 78dd5fd1fcadda79d3023722bfcb8d26e30589f4
      
https://github.com/buildbot/buildbot/commit/78dd5fd1fcadda79d3023722bfcb8d26e30589f4
  Author: Dustin J. Mitchell <[email protected]>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M master/buildbot/status/logfile.py
    M master/buildbot/status/web/logs.py
    M master/buildbot/test/unit/test_status_logfile.py

  Log Message:
  -----------
  Merge jpommerening/buildbot:html-logs-in-pickles (PR #1077)


  Commit: 026a4064c6d7e255a01e441f347971d6881ce788
      
https://github.com/buildbot/buildbot/commit/026a4064c6d7e255a01e441f347971d6881ce788
  Author: Dustin J. Mitchell <[email protected]>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M master/buildbot/status/logfile.py
    M master/buildbot/test/unit/test_status_logfile.py

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

Conflicts:
        master/buildbot/status/logfile.py
        master/buildbot/status/web/logs.py


  Commit: c47b7b6885ad4544c37aa9aca4d87bf9cd6da351
      
https://github.com/buildbot/buildbot/commit/c47b7b6885ad4544c37aa9aca4d87bf9cd6da351
  Author: Dustin J. Mitchell <[email protected]>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

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

  Log Message:
  -----------
  fix merge error in 78dd5fd1fcadda79d3023722bfcb8d26e30589f4


Compare: 
https://github.com/buildbot/buildbot/compare/5138522aeeb9...c47b7b6885ad
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Buildbot-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/buildbot-commits

Reply via email to