Branch: refs/heads/master
Home: https://github.com/buildbot/buildbot
Commit: f518276b3a6e88a6b079a4e2661a152087eedd15
https://github.com/buildbot/buildbot/commit/f518276b3a6e88a6b079a4e2661a152087eedd15
Author: Dustin J. Mitchell <[email protected]>
Date: 2013-12-23 (Mon, 23 Dec 2013)
Changed paths:
M master/buildbot/buildslave/base.py
M master/buildbot/process/properties.py
M master/buildbot/status/slave.py
M master/buildbot/steps/master.py
M master/buildbot/test/fake/fakedb.py
M master/buildbot/test/unit/test_buildslave_base.py
M master/buildbot/test/unit/test_process_properties.py
R master/buildbot/test/unit/test_status_slave.py
M master/docs/manual/cfg-buildsteps.rst
M master/docs/manual/cfg-properties.rst
M master/docs/relnotes/index.rst
Log Message:
-----------
Revert "Merge branch 'SlaveInfo' of git://github.com/jaredgrubb/buildbot"
This reverts commit 1c5973413aa3b7e5f2f197b488cd58206b7ac057, reversing
changes made to bf5c148e7b427c1f685ce846696a90ed2dc24704.
See https://github.com/buildbot/buildbot/pull/880 for details on why
this was reverted.
Conflicts:
master/buildbot/status/slave.py
master/docs/relnotes/index.rst
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Buildbot-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/buildbot-commits
