Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [4380] svn merge from trunk
|
From: <ma...@rh...> - 2009-07-13 19:04:03
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [4380] svn merge from trunk</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>4380</dd> <dt>Author</dt> <dd>mazz</dd> <dt>Date</dt> <dd>2009-07-13 14:03:57 -0500 (Mon, 13 Jul 2009)</dd> </dl> <h3>Log Message</h3> <pre>svn merge from trunk</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqbranchesAGENT_PLUGIN_CLASSLOADINGmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservermeasurementMeasurementDefinitionManagerBeanjava">rhq/branches/AGENT_PLUGIN_CLASSLOADING/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqbranchesAGENT_PLUGIN_CLASSLOADINGmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseservermeasurementMeasurementDefinitionManagerBeanjava"></a> <div class="modfile"><h4>Modified: rhq/branches/AGENT_PLUGIN_CLASSLOADING/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java (4379 => 4380)</h4> <pre class="diff"> <span class="info">--- rhq/branches/AGENT_PLUGIN_CLASSLOADING/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java 2009-07-13 18:50:50 UTC (rev 4379) +++ rhq/branches/AGENT_PLUGIN_CLASSLOADING/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java 2009-07-13 19:03:57 UTC (rev 4380) </span><span class="lines">@@ -136,7 +136,6 @@ </span><span class="cx"> } @SuppressWarnings("unchecked") </span><span class="rem">- @Override </span><span class="cx"> public PageList<MeasurementDefinition> findMeasurementDefinitions(Subject subject, MeasurementDefinition criteria, PageControl pc) throws FetchException { </span> </pre> </div> </div> </body> </html> |