[Buildbot-commits] [buildbot/buildbot] 18e61a: - set compare_attrs to be accumulateClassList() [...
GitHub
noreply at github.com
Sat May 4 23:52:45 UTC 2013
Branch: refs/heads/nine
Home: https://github.com/buildbot/buildbot
Commit: 18e61a35b1dcbfbb2b7c65d5226469c7471985c8
https://github.com/buildbot/buildbot/commit/18e61a35b1dcbfbb2b7c65d5226469c7471985c8
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-01-28 (Mon, 28 Jan 2013)
Changed paths:
M master/buildbot/util/__init__.py
Log Message:
-----------
- set compare_attrs to be accumulateClassList() [wip]
Commit: 1e6c659914a2fbffca4ff9436a6191a668060771
https://github.com/buildbot/buildbot/commit/1e6c659914a2fbffca4ff9436a6191a668060771
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-01-28 (Mon, 28 Jan 2013)
Changed paths:
M master/buildbot/util/__init__.py
Log Message:
-----------
- turn compare_attr into an accumulatedClassList.
Commit: dce8f0a208e8706133eb864d42842216c107a547
https://github.com/buildbot/buildbot/commit/dce8f0a208e8706133eb864d42842216c107a547
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-01-28 (Mon, 28 Jan 2013)
Changed paths:
M master/buildbot/util/__init__.py
Log Message:
-----------
- Fixed spelling.
Commit: e7c9dbc46471af9023933e9900d04b171cc84b9f
https://github.com/buildbot/buildbot/commit/e7c9dbc46471af9023933e9900d04b171cc84b9f
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-01-28 (Mon, 28 Jan 2013)
Changed paths:
M master/buildbot/util/__init__.py
Log Message:
-----------
- compare_attrs belongs to self.
Commit: 3a74221bdf43c6d16a8dc1a071f358804ebc1ad2
https://github.com/buildbot/buildbot/commit/3a74221bdf43c6d16a8dc1a071f358804ebc1ad2
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-01-28 (Mon, 28 Jan 2013)
Changed paths:
M master/buildbot/util/__init__.py
Log Message:
-----------
- Revert all changes except the first.
Commit: 559de65f6843198b87a5971ac9cc45505659a6b4
https://github.com/buildbot/buildbot/commit/559de65f6843198b87a5971ac9cc45505659a6b4
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-01-29 (Tue, 29 Jan 2013)
Changed paths:
M master/buildbot/util/__init__.py
Log Message:
-----------
- Added accumulate(self) method.
Commit: dcd495b7f07e3f03b659fe14cc562d1d7b574a5d
https://github.com/buildbot/buildbot/commit/dcd495b7f07e3f03b659fe14cc562d1d7b574a5d
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-01-29 (Tue, 29 Jan 2013)
Changed paths:
M master/buildbot/test/unit/test_util_ComparableMixin.py
M master/buildbot/util/__init__.py
Log Message:
-----------
- Added self.accumulate() method to accumulate compare_attrs.
Commit: 7bfe283a78cd18d525b4ad113bd002ea28becc9f
https://github.com/buildbot/buildbot/commit/7bfe283a78cd18d525b4ad113bd002ea28becc9f
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-01-29 (Tue, 29 Jan 2013)
Changed paths:
M master/buildbot/test/unit/test_util_ComparableMixin.py
Log Message:
-----------
- test_equality_unimportantDifferences_subclass needs to be changed since b123 no longer equals to b223.
Commit: 2ff7e8187ce03e0421e88b7fbd035c68fe36ad32
https://github.com/buildbot/buildbot/commit/2ff7e8187ce03e0421e88b7fbd035c68fe36ad32
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-01-30 (Wed, 30 Jan 2013)
Changed paths:
M master/buildbot/test/unit/test_util_ComparableMixin.py
M master/buildbot/util/__init__.py
Log Message:
-----------
- removed accumulate(). Changed ComparableMixin to statelessly use accumulatedClassList.
Commit: f6b2d68863b898643b3e061a996d4313e2d86c0a
https://github.com/buildbot/buildbot/commit/f6b2d68863b898643b3e061a996d4313e2d86c0a
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-01-30 (Wed, 30 Jan 2013)
Changed paths:
M master/buildbot/util/__init__.py
Log Message:
-----------
- Import reflect, instead of importing the function.
Commit: d7d7e512abdeca417280fa5e362e6b97a87a8eed
https://github.com/buildbot/buildbot/commit/d7d7e512abdeca417280fa5e362e6b97a87a8eed
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-02 (Tue, 02 Apr 2013)
Changed paths:
M master/buildbot/test/unit/test_util_ComparableMixin.py
Log Message:
-----------
- Removed a test. (Don't remember what it was for).
- Renamed test_inequality_sameClass_differentCompareAttrs to test_instance_attribute_not_used.
Commit: fdb851e85f453b13740cbc65e9cf0e8f95d9e77b
https://github.com/buildbot/buildbot/commit/fdb851e85f453b13740cbc65e9cf0e8f95d9e77b
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-18 (Thu, 18 Apr 2013)
Changed paths:
M master/docs/relnotes/index.rst
Log Message:
-----------
fix git log message in relnotes
Commit: 905471f7838374b584071de3d05f28e2011f23d0
https://github.com/buildbot/buildbot/commit/905471f7838374b584071de3d05f28e2011f23d0
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-18 (Thu, 18 Apr 2013)
Changed paths:
M master/buildbot/util/__init__.py
Log Message:
-----------
- Removed extraneous arguments from accumulateClassList.
Commit: 6a04f1486f51a68150ef1cf94dc1c0579e0ac30d
https://github.com/buildbot/buildbot/commit/6a04f1486f51a68150ef1cf94dc1c0579e0ac30d
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-18 (Thu, 18 Apr 2013)
Changed paths:
M master/buildbot/util/__init__.py
Log Message:
-----------
- Fixed __cmp__ method.
Commit: a5b114693fccfd3b3a313749c61db49b78856812
https://github.com/buildbot/buildbot/commit/a5b114693fccfd3b3a313749c61db49b78856812
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-19 (Fri, 19 Apr 2013)
Changed paths:
M master/buildbot/test/unit/test_util_ComparableMixin.py
Log Message:
-----------
- Changed test_equality_unimportantDifferences_subclass to test_inequality_unimportDifferences_subclass.
Commit: 2a0d3487d24393187c55563b4efb5957d3262922
https://github.com/buildbot/buildbot/commit/2a0d3487d24393187c55563b4efb5957d3262922
Author: Jared Grubb <jgrubb at apple.com>
Date: 2013-04-20 (Sat, 20 Apr 2013)
Changed paths:
M master/docs/developer/cls-iproperties.rst
M master/docs/developer/cls-irenderable.rst
M master/docs/manual/cfg-buildsteps.rst
M master/docs/manual/cfg-properties.rst
Log Message:
-----------
Docs: update some index references
Commit: 1cf18e094774d9585d7a5d2bd9d29caeb177e6d8
https://github.com/buildbot/buildbot/commit/1cf18e094774d9585d7a5d2bd9d29caeb177e6d8
Author: Jared Grubb <jgrubb at apple.com>
Date: 2013-04-20 (Sat, 20 Apr 2013)
Changed paths:
M master/docs/developer/cls-forcesched.rst
Log Message:
-----------
Update documentation for ForceScheduler
Commit: 8fd43ba9a5cfd650650f373d1f5a50443ad993ec
https://github.com/buildbot/buildbot/commit/8fd43ba9a5cfd650650f373d1f5a50443ad993ec
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-20 (Sat, 20 Apr 2013)
Changed paths:
M master/docs/developer/cls-forcesched.rst
Log Message:
-----------
Merge branch 'buildbot-0.8.8'
Commit: 1ef0b6a8161be2665f13c998c976ac3090084aa4
https://github.com/buildbot/buildbot/commit/1ef0b6a8161be2665f13c998c976ac3090084aa4
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-20 (Sat, 20 Apr 2013)
Changed paths:
M master/docs/developer/cls-iproperties.rst
M master/docs/developer/cls-irenderable.rst
M master/docs/manual/cfg-buildsteps.rst
M master/docs/manual/cfg-properties.rst
Log Message:
-----------
Merge branch 'DocsIndexUpdates' of git://github.com/jaredgrubb/buildbot
Commit: 348681302ce0dd61f197d58061fc111151ad9bd3
https://github.com/buildbot/buildbot/commit/348681302ce0dd61f197d58061fc111151ad9bd3
Author: Elmir Jagudin <elmir at axis.com>
Date: 2013-04-20 (Sat, 20 Apr 2013)
Changed paths:
M slave/buildslave/test/unit/test_scripts_runner.py
M slave/buildslave/test/util/misc.py
Log Message:
-----------
tests: move IsBuildslaveDirMixin class to misc module
Make it possible to use IsBuildslaveDirMixin class from other
test modules.
Commit: 0c1b1e808e9c920b6e1e43b38c95fd04d3f2c7e3
https://github.com/buildbot/buildbot/commit/0c1b1e808e9c920b6e1e43b38c95fd04d3f2c7e3
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M master/docs/developer/utils.rst
Log Message:
-----------
- Update utils.rst for compare_attrs note.
Commit: 72b8890d38b435456265e624452859b745ce7b08
https://github.com/buildbot/buildbot/commit/72b8890d38b435456265e624452859b745ce7b08
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M master/buildbot/changes/mail.py
Log Message:
-----------
- Changed mail.py to use accumulateClassList.
Commit: 601e6dbabac80de4214e0129b66f1d26141c4ef2
https://github.com/buildbot/buildbot/commit/601e6dbabac80de4214e0129b66f1d26141c4ef2
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M master/buildbot/schedulers/basic.py
M master/buildbot/schedulers/dependent.py
M master/buildbot/schedulers/timed.py
Log Message:
-----------
- Add reflect to the imports.
Commit: af657ac467c352da396b92496f26750797a24544
https://github.com/buildbot/buildbot/commit/af657ac467c352da396b92496f26750797a24544
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M master/buildbot/schedulers/basic.py
Log Message:
-----------
- Update BaseBasicScheduler to use accumulateClassList.
Commit: e0aae2a1a58c7bde991b6abe7ee48027b76e87de
https://github.com/buildbot/buildbot/commit/e0aae2a1a58c7bde991b6abe7ee48027b76e87de
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M master/buildbot/schedulers/dependent.py
Log Message:
-----------
- Updated dependent.py to use accumulateClassList.
Commit: 63437fd8b773e913465ed3f8e8dcad5912f414ab
https://github.com/buildbot/buildbot/commit/63437fd8b773e913465ed3f8e8dcad5912f414ab
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M master/buildbot/schedulers/timed.py
Log Message:
-----------
- Update timed.py to use accumulateClassList.
Commit: 4e05b1ee89cf4612442da0baef80e1c236e8910b
https://github.com/buildbot/buildbot/commit/4e05b1ee89cf4612442da0baef80e1c236e8910b
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M master/buildbot/schedulers/trysched.py
Log Message:
-----------
- Update trysched.py to use accumulateClassList.
Commit: bc9d417cb9ba4c6c7a150be0e448c500266c1c6d
https://github.com/buildbot/buildbot/commit/bc9d417cb9ba4c6c7a150be0e448c500266c1c6d
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M master/buildbot/test/unit/test_schedulers_manager.py
Log Message:
-----------
-Update test_schedulers_manager.py - remove the concatentation of compare_attrs.
Commit: b10c8b78effe5c952dc2c453c7f4ec8f9c3fdbb8
https://github.com/buildbot/buildbot/commit/b10c8b78effe5c952dc2c453c7f4ec8f9c3fdbb8
Author: Elmir Jagudin <elmir at axis.com>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M slave/buildslave/scripts/runner.py
M slave/buildslave/scripts/startup.py
M slave/buildslave/test/unit/test_scripts_runner.py
A slave/buildslave/test/unit/test_scripts_startup.py
Log Message:
-----------
don't call isBuildslaveDir() twice on buildslave restart
Broke out code to start buildslave process into a utility function
startSlave(). Use it from restart() and startCommand().
Commit: 6037af3ddc26f37a79d205aca31dd8a9c540491e
https://github.com/buildbot/buildbot/commit/6037af3ddc26f37a79d205aca31dd8a9c540491e
Author: Elmir Jagudin <elmir at axis.com>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M slave/buildslave/scripts/runner.py
Log Message:
-----------
specify buildslave subcommand function in it's Options class
Use subcommandFunction class variable of the subcommand's Option flag
to specify the implementing function. This is the same style used in
master cli commands implementation.
Commit: b1041faa139262422f15c2e7aba687af58501bbc
https://github.com/buildbot/buildbot/commit/b1041faa139262422f15c2e7aba687af58501bbc
Author: Elmir Jagudin <elmir at axis.com>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M slave/buildslave/scripts/runner.py
M slave/buildslave/scripts/startup.py
M slave/buildslave/test/unit/test_scripts_runner.py
M slave/buildslave/test/unit/test_scripts_startup.py
Log Message:
-----------
return exit code from buildslave subcommands functions
Use 'return' to communicate buildslave subcommand exit code. This is
how buildbot subcommands are implemented.
Commit: 272246fba02389a078f30a8294f1178951bb6875
https://github.com/buildbot/buildbot/commit/272246fba02389a078f30a8294f1178951bb6875
Author: Elmir Jagudin <elmir at axis.com>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M slave/buildslave/test/unit/test_scripts_runner.py
Log Message:
-----------
test handling of invalid arguments to 'buildslave' cli command
Added unit tests on code in buildslave.scripts.runner.run() that
handles invalid command line arguments.
Commit: 0875f29b577a488760dec82afe175eeeca18377c
https://github.com/buildbot/buildbot/commit/0875f29b577a488760dec82afe175eeeca18377c
Author: Elmir Jagudin <elmir at axis.com>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M slave/buildslave/test/unit/test_scripts_runner.py
Log Message:
-----------
unit test successful invocation of 'buildslave' cli command
Commit: ec62eca18d933c837b42c41dfadeb3dfa68b23a7
https://github.com/buildbot/buildbot/commit/ec62eca18d933c837b42c41dfadeb3dfa68b23a7
Author: Elmir Jagudin <elmir at axis.com>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M slave/buildslave/test/unit/test_scripts_runner.py
Log Message:
-----------
unit test options parsing for 'buildslave' command without arguments
Test that buildslave.scripts.runner.Options class flags invocation of
'buildslave' command without arguments, as invalid.
Commit: 73d2b5b93598033758c6d56129672c1bf4ec7a2f
https://github.com/buildbot/buildbot/commit/73d2b5b93598033758c6d56129672c1bf4ec7a2f
Author: Elmir Jagudin <elmir at axis.com>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M slave/buildslave/test/unit/test_scripts_runner.py
Log Message:
-----------
unit test handling of '--verbose' option for 'buildslave' command
Commit: e31e40389e1c52abc3f308eb72e2a62a663f5529
https://github.com/buildbot/buildbot/commit/e31e40389e1c52abc3f308eb72e2a62a663f5529
Author: Elmir Jagudin <elmir at axis.com>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M slave/buildslave/test/unit/test_scripts_runner.py
Log Message:
-----------
unit test handling of '--version' option for 'buildslave' command
Commit: d8626361079a9e5a4fc32ed8619794e7ac9b4f82
https://github.com/buildbot/buildbot/commit/d8626361079a9e5a4fc32ed8619794e7ac9b4f82
Author: Elmir Jagudin <elmir at axis.com>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
M slave/buildslave/test/unit/test_scripts_runner.py
Log Message:
-----------
added unit tests on buildslave cli Options classes
Commit: 41702af666a1b9575cf8b5cf7bd7e936d9c1d939
https://github.com/buildbot/buildbot/commit/41702af666a1b9575cf8b5cf7bd7e936d9c1d939
Author: Elmir Jagudin <elmir at axis.com>
Date: 2013-04-21 (Sun, 21 Apr 2013)
Changed paths:
A slave/buildslave/scripts/create_slave.py
A slave/buildslave/scripts/restart.py
M slave/buildslave/scripts/runner.py
A slave/buildslave/scripts/start.py
R slave/buildslave/scripts/startup.py
A slave/buildslave/scripts/stop.py
A slave/buildslave/scripts/upgrade_slave.py
M slave/buildslave/test/test_extra_coverage.py
A slave/buildslave/test/unit/test_scripts_restart.py
M slave/buildslave/test/unit/test_scripts_runner.py
A slave/buildslave/test/unit/test_scripts_start.py
R slave/buildslave/test/unit/test_scripts_startup.py
A slave/buildslave/test/unit/test_scripts_stop.py
A slave/buildslave/test/unit/test_scripts_upgrade_slave.py
Log Message:
-----------
buildslave cli: broke out subcommand code to separate modules
Moved sumcommands implementations from buildslave.scripts.runner to
separate modules, one for each subcommand.
Commit: ad302035cf476ad0aa141a57f995987545a37cf3
https://github.com/buildbot/buildbot/commit/ad302035cf476ad0aa141a57f995987545a37cf3
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
A slave/buildslave/scripts/create_slave.py
A slave/buildslave/scripts/restart.py
M slave/buildslave/scripts/runner.py
A slave/buildslave/scripts/start.py
R slave/buildslave/scripts/startup.py
A slave/buildslave/scripts/stop.py
A slave/buildslave/scripts/upgrade_slave.py
M slave/buildslave/test/test_extra_coverage.py
A slave/buildslave/test/unit/test_scripts_restart.py
M slave/buildslave/test/unit/test_scripts_runner.py
A slave/buildslave/test/unit/test_scripts_start.py
A slave/buildslave/test/unit/test_scripts_stop.py
A slave/buildslave/test/unit/test_scripts_upgrade_slave.py
M slave/buildslave/test/util/misc.py
Log Message:
-----------
Merge branch 'slave-cli-fixes' of git://github.com/elmirjagudin/buildbot
Commit: fae7b3b379cf99a911bc6fa62b41867e0141f65c
https://github.com/buildbot/buildbot/commit/fae7b3b379cf99a911bc6fa62b41867e0141f65c
Author: Benoît Allard <benoit.allard at gmx.de>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M master/buildbot/status/web/status_json.py
Log Message:
-----------
JSONP: Add _ as a valid character for the callback name
At least angularjs is using callbacks names with underscore in them, and that's a valid character in a JavaScript identifier name anyway.
Commit: 62e35b1b2624a180da94f21d10f3371d34bace96
https://github.com/buildbot/buildbot/commit/62e35b1b2624a180da94f21d10f3371d34bace96
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-22 (Mon, 22 Apr 2013)
Changed paths:
M master/buildbot/status/web/status_json.py
Log Message:
-----------
Merge branch 'patch-6' of git://github.com/benallard/buildbot
Commit: 4e85c1b1cf2c5dda50c69b00fa441d997fd4b5c0
https://github.com/buildbot/buildbot/commit/4e85c1b1cf2c5dda50c69b00fa441d997fd4b5c0
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M master/buildbot/schedulers/trysched.py
M master/buildbot/util/__init__.py
Log Message:
-----------
- Removed unneeded lines.
Commit: c7caf905d01887e36a9975e4b5fc7786f3888706
https://github.com/buildbot/buildbot/commit/c7caf905d01887e36a9975e4b5fc7786f3888706
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M master/buildbot/util/__init__.py
Log Message:
-----------
- re-added back some lines.
Commit: d16ef7a4fb60b143809fb121243f8f677125130d
https://github.com/buildbot/buildbot/commit/d16ef7a4fb60b143809fb121243f8f677125130d
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M master/buildbot/util/__init__.py
Log Message:
-----------
- Compare classes and not names.
Commit: adab8cacc82d51f21db28076e9cc5298a9fc65af
https://github.com/buildbot/buildbot/commit/adab8cacc82d51f21db28076e9cc5298a9fc65af
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M master/buildbot/changes/mail.py
M master/buildbot/schedulers/basic.py
M master/buildbot/schedulers/dependent.py
M master/buildbot/schedulers/timed.py
Log Message:
-----------
- Removed unneeded code from constructors.
Commit: 965058019a12bfe50589ef7d2f71202b441e7c9b
https://github.com/buildbot/buildbot/commit/965058019a12bfe50589ef7d2f71202b441e7c9b
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M master/buildbot/test/unit/test_util_ComparableMixin.py
M master/buildbot/util/__init__.py
Log Message:
-----------
- Changed test : f123 < b123.
- Used acomp instead of having acomp and bcomp.
Commit: ec259532cfa7284fe4a61be5bedd46131d848fe7
https://github.com/buildbot/buildbot/commit/ec259532cfa7284fe4a61be5bedd46131d848fe7
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M master/buildbot/schedulers/basic.py
M master/buildbot/schedulers/dependent.py
M master/buildbot/schedulers/timed.py
M master/buildbot/schedulers/trysched.py
M master/buildbot/util/__init__.py
Log Message:
-----------
- Removed references to reflect. (No longer used)
- Changed acomp to compare_attrs.
- Removed unnecessary code.
Commit: b3c5ded917b0313f4b666357c5927c8cc7ed417e
https://github.com/buildbot/buildbot/commit/b3c5ded917b0313f4b666357c5927c8cc7ed417e
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-23 (Tue, 23 Apr 2013)
Changed paths:
M master/buildbot/schedulers/timed.py
Log Message:
-----------
- Removed unnecessary line.
Commit: 706ad7581e0c3a66ee107b29634169719e11ba82
https://github.com/buildbot/buildbot/commit/706ad7581e0c3a66ee107b29634169719e11ba82
Author: liucougar <liucougar at gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M master/buildbot/process/properties.py
M master/buildbot/steps/shell.py
M master/buildbot/test/unit/test_steps_shell.py
M master/buildbot/util/__init__.py
M master/docs/manual/cfg-properties.rst
M master/docs/relnotes/0.8.8.rst
Log Message:
-----------
new Renderable FlattenList which flattens nested list
Commit: a217ca26f8d0b570b7084e240399a57176ad68b0
https://github.com/buildbot/buildbot/commit/a217ca26f8d0b570b7084e240399a57176ad68b0
Author: Edmund Wong <ewongbb at pw-wspx.org>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M master/buildbot/changes/mail.py
M master/buildbot/test/unit/test_schedulers_manager.py
Log Message:
-----------
- Removed mentions of reflect.
Commit: 905424119a11f6470dee70323c056f4a3e9a957d
https://github.com/buildbot/buildbot/commit/905424119a11f6470dee70323c056f4a3e9a957d
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Changed paths:
M master/buildbot/test/util/change_import.py
Log Message:
-----------
remove doctest-like thing that confuses pyflakes
Commit: bad9881d117d794f4af8d5c4e23237f992f7c9c7
https://github.com/buildbot/buildbot/commit/bad9881d117d794f4af8d5c4e23237f992f7c9c7
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M master/docs/relnotes/index.rst
Log Message:
-----------
add relnotes for dad3bf98fe27cf821d5b4e08160071af4777250d
Commit: e4c7292200c215c1b5e1ead0fc46ece255a263b6
https://github.com/buildbot/buildbot/commit/e4c7292200c215c1b5e1ead0fc46ece255a263b6
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M master/docs/relnotes/index.rst
Log Message:
-----------
typo
Commit: 718815e1d429514b23a9f58f2002cc0f2b24c3e5
https://github.com/buildbot/buildbot/commit/718815e1d429514b23a9f58f2002cc0f2b24c3e5
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M master/buildbot/process/properties.py
M master/buildbot/steps/shell.py
M master/buildbot/test/unit/test_steps_shell.py
M master/buildbot/util/__init__.py
M master/docs/manual/cfg-properties.rst
M master/docs/relnotes/0.8.8.rst
Log Message:
-----------
Merge branch 'flatten-all-renderables' of git://github.com/liucougar/buildbot
Commit: cf486cdbae379d64a41ef6a6c9d914b1791c1590
https://github.com/buildbot/buildbot/commit/cf486cdbae379d64a41ef6a6c9d914b1791c1590
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M master/docs/manual/cfg-properties.rst
Log Message:
-----------
touch up the docs
Commit: 5d396a74d38c34b10618fd16be762acab14d5e6f
https://github.com/buildbot/buildbot/commit/5d396a74d38c34b10618fd16be762acab14d5e6f
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M master/docs/relnotes/0.8.8.rst
M master/docs/relnotes/index.rst
Log Message:
-----------
move relnotes to the right file
Commit: 9c2b15baf6d7cff78d94dfb6a2999f7a1fa3c797
https://github.com/buildbot/buildbot/commit/9c2b15baf6d7cff78d94dfb6a2999f7a1fa3c797
Author: Olof Johansson <olofjn at axis.com>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M master/docs/manual/cfg-statustargets.rst
Log Message:
-----------
Update docs referring to the old getProjectName()
The buildbot.status.master.getProjectName() has been renamed to
getTitle().
Commit: b08cb73804564cf13e905905128333a932120717
https://github.com/buildbot/buildbot/commit/b08cb73804564cf13e905905128333a932120717
Author: Sean Kelly <code at katron.org>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M master/buildbot/buildslave/openstack.py
Log Message:
-----------
Don't defer stopping OpenStack slave to a thread
The thread didn't do anything but poll whether the instance was deleted
or not. That's not very useful, so drop the polling and simply delete
the instance.
Commit: 63e6d17b39ef23a5996e6907d36c46b329083f10
https://github.com/buildbot/buildbot/commit/63e6d17b39ef23a5996e6907d36c46b329083f10
Author: Sean Kelly <code at katron.org>
Date: 2013-04-25 (Thu, 25 Apr 2013)
Changed paths:
M master/buildbot/buildslave/openstack.py
Log Message:
-----------
Don't reference self.instance in _start_instance
Don't reference self.instance, since it could be set to None by
stop_instance. This does not happen yet, but could in the future.
Commit: 7a29ec55a615e5282bd66a7224691b4397360552
https://github.com/buildbot/buildbot/commit/7a29ec55a615e5282bd66a7224691b4397360552
Author: @damnwidget <oscar.campos at member.fsf.org>
Date: 2013-04-26 (Fri, 26 Apr 2013)
Changed paths:
M master/buildbot/status/web/baseweb.py
A master/buildbot/status/web/files/exception_large.png
A master/buildbot/status/web/files/exception_normal.png
A master/buildbot/status/web/files/exception_small.png
A master/buildbot/status/web/files/failure_large.png
A master/buildbot/status/web/files/failure_normal.png
A master/buildbot/status/web/files/failure_small.png
A master/buildbot/status/web/files/readme_svg.txt
A master/buildbot/status/web/files/retry_large.png
A master/buildbot/status/web/files/retry_normal.png
A master/buildbot/status/web/files/retry_small.png
A master/buildbot/status/web/files/skipped_large.png
A master/buildbot/status/web/files/skipped_normal.png
A master/buildbot/status/web/files/skipped_small.png
A master/buildbot/status/web/files/status.svg
A master/buildbot/status/web/files/status_large.svg
A master/buildbot/status/web/files/status_small.svg
A master/buildbot/status/web/files/success_large.png
A master/buildbot/status/web/files/success_normal.png
A master/buildbot/status/web/files/success_small.png
A master/buildbot/status/web/files/unknown_large.png
A master/buildbot/status/web/files/unknown_normal.png
A master/buildbot/status/web/files/unknown_small.png
A master/buildbot/status/web/files/warnings_large.png
A master/buildbot/status/web/files/warnings_normal.png
A master/buildbot/status/web/files/warnings_small.png
A master/buildbot/status/web/pngstatus.py
A master/buildbot/test/unit/test_status_web_png_resource.py
A master/docs/_images/success_normal.png
M master/docs/manual/cfg-statustargets.rst
M master/docs/relnotes/index.rst
M master/setup.py
Log Message:
-----------
added builds status png view (like travis png status) with SVG models
Commit: 682d9e0b28138ca1d354cdec1e812e45325277cf
https://github.com/buildbot/buildbot/commit/682d9e0b28138ca1d354cdec1e812e45325277cf
Author: Vladimir Rutsky <altsysrq at gmail.com>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M master/buildbot/status/build.py
Log Message:
-----------
Fix typo: ths
Commit: 20d12fbf3bb717a78ded123f5a0624d158c2ffde
https://github.com/buildbot/buildbot/commit/20d12fbf3bb717a78ded123f5a0624d158c2ffde
Author: Vladimir Rutsky <altsysrq at gmail.com>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M master/buildbot/status/web/grid.py
Log Message:
-----------
Fix build start time retrieving
When build is not finished getTimes() returns tuple (start_time, None),
and min((start_time, None)) == None. This lead to incorrect sorting of
builds in grid view --- not finished builds were displayed first and if
there were more build revisions than grid width builds (five by default)
not finished builds doesn't displayed at all.
Commit: 39fe2d6728ab467baead06742110d83d407ab12d
https://github.com/buildbot/buildbot/commit/39fe2d6728ab467baead06742110d83d407ab12d
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-27 (Sat, 27 Apr 2013)
Changed paths:
M master/docs/manual/cfg-statustargets.rst
M master/docs/relnotes/index.rst
Log Message:
-----------
Merge branch 'docfix/getprojectname_gettitle' of git://github.com/olof/buildbot
Commit: f2ab36fbe2276fbe1e94a952c49211418c229978
https://github.com/buildbot/buildbot/commit/f2ab36fbe2276fbe1e94a952c49211418c229978
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M master/buildbot/status/web/baseweb.py
A master/buildbot/status/web/files/exception_large.png
A master/buildbot/status/web/files/exception_normal.png
A master/buildbot/status/web/files/exception_small.png
A master/buildbot/status/web/files/failure_large.png
A master/buildbot/status/web/files/failure_normal.png
A master/buildbot/status/web/files/failure_small.png
A master/buildbot/status/web/files/readme_svg.txt
A master/buildbot/status/web/files/retry_large.png
A master/buildbot/status/web/files/retry_normal.png
A master/buildbot/status/web/files/retry_small.png
A master/buildbot/status/web/files/skipped_large.png
A master/buildbot/status/web/files/skipped_normal.png
A master/buildbot/status/web/files/skipped_small.png
A master/buildbot/status/web/files/status.svg
A master/buildbot/status/web/files/status_large.svg
A master/buildbot/status/web/files/status_small.svg
A master/buildbot/status/web/files/success_large.png
A master/buildbot/status/web/files/success_normal.png
A master/buildbot/status/web/files/success_small.png
A master/buildbot/status/web/files/unknown_large.png
A master/buildbot/status/web/files/unknown_normal.png
A master/buildbot/status/web/files/unknown_small.png
A master/buildbot/status/web/files/warnings_large.png
A master/buildbot/status/web/files/warnings_normal.png
A master/buildbot/status/web/files/warnings_small.png
A master/buildbot/status/web/pngstatus.py
A master/buildbot/test/unit/test_status_web_png_resource.py
A master/docs/_images/success_normal.png
M master/docs/manual/cfg-statustargets.rst
M master/docs/relnotes/index.rst
M master/setup.py
Log Message:
-----------
Merge branch 'pngstatus' of git://github.com/DamnWidget/buildbot
Commit: 3c0c55fdf31e6be2e001e4c620429d2892df7fb3
https://github.com/buildbot/buildbot/commit/3c0c55fdf31e6be2e001e4c620429d2892df7fb3
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M master/docs/relnotes/index.rst
Log Message:
-----------
edit relnotes
Commit: 30f8579333c78d74ae8989ad95a57976fbcf2995
https://github.com/buildbot/buildbot/commit/30f8579333c78d74ae8989ad95a57976fbcf2995
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M master/docs/manual/cfg-statustargets.rst
Log Message:
-----------
fix image link
Commit: 2e5980ffee856ec830f380d23b3c59629b0630c1
https://github.com/buildbot/buildbot/commit/2e5980ffee856ec830f380d23b3c59629b0630c1
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M master/buildbot/changes/mail.py
M master/buildbot/schedulers/basic.py
M master/buildbot/schedulers/dependent.py
M master/buildbot/schedulers/timed.py
M master/buildbot/schedulers/trysched.py
M master/buildbot/test/unit/test_schedulers_manager.py
M master/buildbot/test/unit/test_util_ComparableMixin.py
M master/buildbot/util/__init__.py
M master/docs/developer/utils.rst
Log Message:
-----------
use inequality instead of lt - order doesn't really matter
Commit: 2169457f2f28357277001669f8c3bbcbc00f069c
https://github.com/buildbot/buildbot/commit/2169457f2f28357277001669f8c3bbcbc00f069c
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M master/buildbot/status/web/grid.py
Log Message:
-----------
Merge branch 'grid_build_time_bug' of git://github.com/vrutsky/buildbot
Commit: 4095a96eb06501377c31fae00b153a248cacae6b
https://github.com/buildbot/buildbot/commit/4095a96eb06501377c31fae00b153a248cacae6b
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M master/buildbot/status/build.py
Log Message:
-----------
Merge branch 'typos2' of git://github.com/vrutsky/buildbot
Commit: 7268940c7b51cbebff8b425a01f8b47a3ebb95e9
https://github.com/buildbot/buildbot/commit/7268940c7b51cbebff8b425a01f8b47a3ebb95e9
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
Changed paths:
M master/buildbot/buildslave/openstack.py
Log Message:
-----------
Merge branch 'openstack-cleanup' of git://github.com/seankelly/buildbot
Commit: ea401b7afc3c168b23c40dac167f4c0fec5dd6f3
https://github.com/buildbot/buildbot/commit/ea401b7afc3c168b23c40dac167f4c0fec5dd6f3
Author: @damnwidget <oscar.campos at member.fsf.org>
Date: 2013-04-30 (Tue, 30 Apr 2013)
Changed paths:
M master/buildbot/status/web/hooks/github.py
Log Message:
-----------
fixed several PEP8 violations
Commit: 20bf5c66e7b72389ac8ee532b6c1c596d886bdc4
https://github.com/buildbot/buildbot/commit/20bf5c66e7b72389ac8ee532b6c1c596d886bdc4
Author: @damnwidget <oscar.campos at member.fsf.org>
Date: 2013-04-30 (Tue, 30 Apr 2013)
Changed paths:
M master/buildbot/status/web/hooks/github.py
Log Message:
-----------
removed docstring clearly inherited from contrib code
Commit: 30ed6549d5f6eddb86c2c9cff53fb2a76109e9de
https://github.com/buildbot/buildbot/commit/30ed6549d5f6eddb86c2c9cff53fb2a76109e9de
Author: @damnwidget <oscar.campos at member.fsf.org>
Date: 2013-04-30 (Tue, 30 Apr 2013)
Changed paths:
M master/buildbot/status/web/hooks/github.py
Log Message:
-----------
full refactor of github web hook:
- removed unnecessary time conversions and replace it with
dateutil.parser
- updated dictionary keys that were hitting deprecation warnings (who
and when for author and when_timestamp)
- reindentation and other code sanitize
Commit: ff44c99b45c013280bd8de66eb44c5789bba64c9
https://github.com/buildbot/buildbot/commit/ff44c99b45c013280bd8de66eb44c5789bba64c9
Author: Oscar Campos <oscar.campos at member.fsf.org>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
A master/buildbot/status/web/hooks/bitbucket.py
A master/buildbot/test/unit/test_status_web_change_hooks_bitbucket.py
M master/buildbot/test/unit/test_status_web_change_hooks_github.py
M master/docs/manual/cfg-changesources.rst
M master/docs/manual/cfg-statustargets.rst
Log Message:
-----------
added bitbucket web status hook
Commit: f0dbd4d6e3bcbb9647753d72b1c4f31ae04ba341
https://github.com/buildbot/buildbot/commit/f0dbd4d6e3bcbb9647753d72b1c4f31ae04ba341
Author: Jared Grubb <jgrubb at apple.com>
Date: 2013-05-01 (Wed, 01 May 2013)
Changed paths:
M master/buildbot/process/builder.py
M master/buildbot/status/web/build.py
M master/buildbot/status/web/templates/forms.html
M master/docs/relnotes/index.rst
Log Message:
-----------
Add option to 'Rebuild' button to build updated sources
Right now the Rebuild button builds the exact same checkout as another build. This makes it difficult
for the following workflow:
* run a build on a branch; it fails
* fix the branch it built
* hit "rebuild" -> but it builds the original revision
Commit: 9255a8219f3bde6ab1166eb1fa605f7ca1127499
https://github.com/buildbot/buildbot/commit/9255a8219f3bde6ab1166eb1fa605f7ca1127499
Author: Elmir Jagudin <elmir at axis.com>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M slave/buildslave/test/unit/test_scripts_upgrade_slave.py
M slave/buildslave/test/util/misc.py
Log Message:
-----------
unit tests on 'buildslave upgrade' command
Test that older buildbot.tac files are updated correctly.
Test that modern buildbot.tac files are not changed.
Commit: 4267e5bbf0ff98dcc2c4652d1f0063e970043056
https://github.com/buildbot/buildbot/commit/4267e5bbf0ff98dcc2c4652d1f0063e970043056
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
A master/buildbot/status/web/hooks/bitbucket.py
M master/buildbot/status/web/hooks/github.py
A master/buildbot/test/unit/test_status_web_change_hooks_bitbucket.py
M master/buildbot/test/unit/test_status_web_change_hooks_github.py
M master/docs/manual/cfg-changesources.rst
M master/docs/manual/cfg-statustargets.rst
Log Message:
-----------
Merge branch 'bitbucket' of git://github.com/DamnWidget/buildbot
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
# (use "git commit" to conclude merge)
#
# Changes to be committed:
#
# new file: master/buildbot/status/web/hooks/bitbucket.py
# modified: master/buildbot/status/web/hooks/github.py
# new file: master/buildbot/test/unit/test_status_web_change_hooks_bitbucket.py
# modified: master/buildbot/test/unit/test_status_web_change_hooks_github.py
# modified: master/docs/manual/cfg-changesources.rst
# modified: master/docs/manual/cfg-statustargets.rst
#
Commit: 8407f32c505e5ba7dc861acd95773a76c524203e
https://github.com/buildbot/buildbot/commit/8407f32c505e5ba7dc861acd95773a76c524203e
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M master/docs/relnotes/index.rst
Log Message:
-----------
add relnotes for previous commit
Commit: dd5fabd098b19f970d83056caad3145ae80c63bb
https://github.com/buildbot/buildbot/commit/dd5fabd098b19f970d83056caad3145ae80c63bb
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-05-03 (Fri, 03 May 2013)
Changed paths:
M master/buildbot/process/builder.py
M master/buildbot/status/web/build.py
M master/buildbot/status/web/templates/forms.html
M master/docs/relnotes/index.rst
Log Message:
-----------
Merge branch 'RebuildOptions' of git://github.com/jaredgrubb/buildbot
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
# (use "git commit" to conclude merge)
#
# Changes to be committed:
#
# modified: master/buildbot/process/builder.py
# modified: master/buildbot/status/web/build.py
# modified: master/buildbot/status/web/templates/forms.html
# modified: master/docs/relnotes/index.rst
#
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
# On branch master
# Changes to be committed:
# (use "git reset HEAD^1 <file>..." to unstage)
#
# modified: master/buildbot/process/builder.py
# modified: master/buildbot/status/web/build.py
# modified: master/buildbot/status/web/templates/forms.html
# modified: master/docs/relnotes/index.rst
#
Commit: 5a4869c84dc011c17e63c06b67fb7ba771fc6713
https://github.com/buildbot/buildbot/commit/5a4869c84dc011c17e63c06b67fb7ba771fc6713
Author: Jared Grubb <jgrubb at apple.com>
Date: 2013-05-04 (Sat, 04 May 2013)
Changed paths:
M master/buildbot/scripts/logwatcher.py
Log Message:
-----------
Extend the reconfig timer when certain progress lines are seen
Commit: f9c9c95796158fc7212c60d25e8e05798c4c124f
https://github.com/buildbot/buildbot/commit/f9c9c95796158fc7212c60d25e8e05798c4c124f
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-05-04 (Sat, 04 May 2013)
Changed paths:
M slave/buildslave/test/unit/test_scripts_upgrade_slave.py
M slave/buildslave/test/util/misc.py
Log Message:
-----------
Merge branch 'slave-upgrade-tests' of git://github.com/elmirjagudin/buildbot
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
# (use "git commit" to conclude merge)
#
# Changes to be committed:
#
# modified: ../slave/buildslave/test/unit/test_scripts_upgrade_slave.py
# modified: ../slave/buildslave/test/util/misc.py
#
Commit: 5424db66701b14abdc611ca64aa997ff04a949ce
https://github.com/buildbot/buildbot/commit/5424db66701b14abdc611ca64aa997ff04a949ce
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-05-04 (Sat, 04 May 2013)
Changed paths:
M master/buildbot/scripts/logwatcher.py
Log Message:
-----------
Merge branch 'ExtendReconfig' of git://github.com/jaredgrubb/buildbot
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
# (use "git commit" to conclude merge)
#
# Changes to be committed:
#
# modified: master/buildbot/scripts/logwatcher.py
#
Commit: c19cc825d7a46b12741bfad35288d2926ce4a2f5
https://github.com/buildbot/buildbot/commit/c19cc825d7a46b12741bfad35288d2926ce4a2f5
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-05-04 (Sat, 04 May 2013)
Changed paths:
M master/docs/relnotes/index.rst
Log Message:
-----------
add relnotes for previous
Commit: b03f8053326f0bda9c45fe8ce785b90c1b5c474b
https://github.com/buildbot/buildbot/commit/b03f8053326f0bda9c45fe8ce785b90c1b5c474b
Author: Dustin J. Mitchell <dustin at mozilla.com>
Date: 2013-05-04 (Sat, 04 May 2013)
Changed paths:
M master/buildbot/buildslave/openstack.py
M master/buildbot/changes/mail.py
M master/buildbot/process/properties.py
M master/buildbot/schedulers/basic.py
M master/buildbot/schedulers/dependent.py
M master/buildbot/schedulers/timed.py
M master/buildbot/schedulers/trysched.py
M master/buildbot/scripts/logwatcher.py
M master/buildbot/status/build.py
M master/buildbot/status/web/baseweb.py
M master/buildbot/status/web/build.py
A master/buildbot/status/web/files/exception_large.png
A master/buildbot/status/web/files/exception_normal.png
A master/buildbot/status/web/files/exception_small.png
A master/buildbot/status/web/files/failure_large.png
A master/buildbot/status/web/files/failure_normal.png
A master/buildbot/status/web/files/failure_small.png
A master/buildbot/status/web/files/readme_svg.txt
A master/buildbot/status/web/files/retry_large.png
A master/buildbot/status/web/files/retry_normal.png
A master/buildbot/status/web/files/retry_small.png
A master/buildbot/status/web/files/skipped_large.png
A master/buildbot/status/web/files/skipped_normal.png
A master/buildbot/status/web/files/skipped_small.png
A master/buildbot/status/web/files/status.svg
A master/buildbot/status/web/files/status_large.svg
A master/buildbot/status/web/files/status_small.svg
A master/buildbot/status/web/files/success_large.png
A master/buildbot/status/web/files/success_normal.png
A master/buildbot/status/web/files/success_small.png
A master/buildbot/status/web/files/unknown_large.png
A master/buildbot/status/web/files/unknown_normal.png
A master/buildbot/status/web/files/unknown_small.png
A master/buildbot/status/web/files/warnings_large.png
A master/buildbot/status/web/files/warnings_normal.png
A master/buildbot/status/web/files/warnings_small.png
M master/buildbot/status/web/grid.py
A master/buildbot/status/web/hooks/bitbucket.py
M master/buildbot/status/web/hooks/github.py
A master/buildbot/status/web/pngstatus.py
M master/buildbot/status/web/status_json.py
M master/buildbot/status/web/templates/forms.html
M master/buildbot/steps/shell.py
M master/buildbot/test/unit/test_schedulers_manager.py
A master/buildbot/test/unit/test_status_web_change_hooks_bitbucket.py
M master/buildbot/test/unit/test_status_web_change_hooks_github.py
A master/buildbot/test/unit/test_status_web_png_resource.py
M master/buildbot/test/unit/test_steps_shell.py
M master/buildbot/test/unit/test_util_ComparableMixin.py
M master/buildbot/test/util/change_import.py
M master/buildbot/util/__init__.py
A master/docs/_images/success_normal.png
M master/docs/developer/cls-forcesched.rst
M master/docs/developer/cls-iproperties.rst
M master/docs/developer/cls-irenderable.rst
M master/docs/developer/utils.rst
M master/docs/manual/cfg-buildsteps.rst
M master/docs/manual/cfg-changesources.rst
M master/docs/manual/cfg-properties.rst
M master/docs/manual/cfg-statustargets.rst
M master/docs/relnotes/index.rst
M master/setup.py
A slave/buildslave/scripts/create_slave.py
A slave/buildslave/scripts/restart.py
M slave/buildslave/scripts/runner.py
A slave/buildslave/scripts/start.py
R slave/buildslave/scripts/startup.py
A slave/buildslave/scripts/stop.py
A slave/buildslave/scripts/upgrade_slave.py
M slave/buildslave/test/test_extra_coverage.py
A slave/buildslave/test/unit/test_scripts_restart.py
M slave/buildslave/test/unit/test_scripts_runner.py
A slave/buildslave/test/unit/test_scripts_start.py
A slave/buildslave/test/unit/test_scripts_stop.py
A slave/buildslave/test/unit/test_scripts_upgrade_slave.py
M slave/buildslave/test/util/misc.py
Log Message:
-----------
Merge branch 'master' into nine
Conflicts:
master/buildbot/process/builder.py
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
# On branch nine
# All conflicts fixed but you are still merging.
# (use "git commit" to conclude merge)
#
# Changes to be committed:
#
# modified: master/buildbot/buildslave/openstack.py
# modified: master/buildbot/changes/mail.py
# modified: master/buildbot/process/properties.py
# modified: master/buildbot/schedulers/basic.py
# modified: master/buildbot/schedulers/dependent.py
# modified: master/buildbot/schedulers/timed.py
# modified: master/buildbot/schedulers/trysched.py
# modified: master/buildbot/scripts/logwatcher.py
# modified: master/buildbot/status/build.py
# modified: master/buildbot/status/web/baseweb.py
# modified: master/buildbot/status/web/build.py
# new file: master/buildbot/status/web/files/exception_large.png
# new file: master/buildbot/status/web/files/exception_normal.png
# new file: master/buildbot/status/web/files/exception_small.png
# new file: master/buildbot/status/web/files/failure_large.png
# new file: master/buildbot/status/web/files/failure_normal.png
# new file: master/buildbot/status/web/files/failure_small.png
# new file: master/buildbot/status/web/files/readme_svg.txt
# new file: master/buildbot/status/web/files/retry_large.png
# new file: master/buildbot/status/web/files/retry_normal.png
# new file: master/buildbot/status/web/files/retry_small.png
# new file: master/buildbot/status/web/files/skipped_large.png
# new file: master/buildbot/status/web/files/skipped_normal.png
# new file: master/buildbot/status/web/files/skipped_small.png
# new file: master/buildbot/status/web/files/status.svg
# new file: master/buildbot/status/web/files/status_large.svg
# new file: master/buildbot/status/web/files/status_small.svg
# new file: master/buildbot/status/web/files/success_large.png
# new file: master/buildbot/status/web/files/success_normal.png
# new file: master/buildbot/status/web/files/success_small.png
# new file: master/buildbot/status/web/files/unknown_large.png
# new file: master/buildbot/status/web/files/unknown_normal.png
# new file: master/buildbot/status/web/files/unknown_small.png
# new file: master/buildbot/status/web/files/warnings_large.png
# new file: master/buildbot/status/web/files/warnings_normal.png
# new file: master/buildbot/status/web/files/warnings_small.png
# modified: master/buildbot/status/web/grid.py
# new file: master/buildbot/status/web/hooks/bitbucket.py
# modified: master/buildbot/status/web/hooks/github.py
# new file: master/buildbot/status/web/pngstatus.py
# modified: master/buildbot/status/web/status_json.py
# modified: master/buildbot/status/web/templates/forms.html
# modified: master/buildbot/steps/shell.py
# modified: master/buildbot/test/unit/test_schedulers_manager.py
# new file: master/buildbot/test/unit/test_status_web_change_hooks_bitbucket.py
# modified: master/buildbot/test/unit/test_status_web_change_hooks_github.py
# new file: master/buildbot/test/unit/test_status_web_png_resource.py
# modified: master/buildbot/test/unit/test_steps_shell.py
# modified: master/buildbot/test/unit/test_util_ComparableMixin.py
# modified: master/buildbot/test/util/change_import.py
# modified: master/buildbot/util/__init__.py
# new file: master/docs/_images/success_normal.png
# modified: master/docs/developer/cls-forcesched.rst
# modified: master/docs/developer/cls-iproperties.rst
# modified: master/docs/developer/cls-irenderable.rst
# modified: master/docs/developer/utils.rst
# modified: master/docs/manual/cfg-buildsteps.rst
# modified: master/docs/manual/cfg-changesources.rst
# modified: master/docs/manual/cfg-properties.rst
# modified: master/docs/manual/cfg-statustargets.rst
# modified: master/docs/relnotes/index.rst
# modified: master/setup.py
# new file: slave/buildslave/scripts/create_slave.py
# new file: slave/buildslave/scripts/restart.py
# modified: slave/buildslave/scripts/runner.py
# renamed: slave/buildslave/scripts/startup.py -> slave/buildslave/scripts/start.py
# new file: slave/buildslave/scripts/stop.py
# new file: slave/buildslave/scripts/upgrade_slave.py
# modified: slave/buildslave/test/test_extra_coverage.py
# new file: slave/buildslave/test/unit/test_scripts_restart.py
# modified: slave/buildslave/test/unit/test_scripts_runner.py
# new file: slave/buildslave/test/unit/test_scripts_start.py
# new file: slave/buildslave/test/unit/test_scripts_stop.py
# new file: slave/buildslave/test/unit/test_scripts_upgrade_slave.py
# modified: slave/buildslave/test/util/misc.py
#
Compare: https://github.com/buildbot/buildbot/compare/42f4973cd975...b03f8053326f
More information about the Commits
mailing list