This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/usr/bin/env python | |
import Globals | |
from Products.ZenUtils.ZenScriptBase import ZenScriptBase | |
from ZODB.transact import transact | |
def checkIp(dev): | |
print "Checking Ips for %s" % dev.titleOrId() | |
for interface in dev.os.interfaces(): | |
interface.checkRelations(repair=True) | |
for ip in interface.ipaddresses(): |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
packs = None | |
if hasattr(dmd, 'ZenPackManager'): | |
packs = dmd.ZenPackManager.packs | |
else: | |
packs = dmd.packs | |
phase2 = False | |
for pack in packs(): | |
try: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: trunk/core/Products/Zuul/facades/devicefacade.py | |
=================================================================== | |
--- trunk/core/Products/Zuul/facades/devicefacade.py (revision 62389) | |
+++ trunk/core/Products/Zuul/facades/devicefacade.py (revision 62567) | |
@@ -1,9 +1,9 @@ | |
############################################################################## | |
-# | |
+# | |
# Copyright (C) Zenoss, Inc. 2009, all rights reserved. | |
-# |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: branches/core/zenoss-4.2.x/Products/ZenUI3/browser/resources/js/zenoss/ComponentPanel.js | |
=================================================================== | |
--- branches/core/zenoss-4.2.x/Products/ZenUI3/browser/resources/js/zenoss/ComponentPanel.js (revision 61801) | |
+++ branches/core/zenoss-4.2.x/Products/ZenUI3/browser/resources/js/zenoss/ComponentPanel.js (revision 62483) | |
@@ -566,7 +566,4 @@ | |
if (token.split(Ext.History.DELIMITER).length!=3) { | |
this.getSelectionModel().selectRange(0, 0); | |
- // Ext, for some reason, doesn't fire selectionchange at this | |
- // point, so we'll do it ourselves. | |
- this.fireEvent('selectionchange', this, this.getSelectionModel().getSelection()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: /branches/core/zenoss-4.2.x/Products/ZenUtils/MySqlZodbFactory.py | |
=================================================================== | |
--- /branches/core/zenoss-4.2.x/Products/ZenUtils/MySqlZodbFactory.py (revision 62263) | |
+++ /branches/core/zenoss-4.2.x/Products/ZenUtils/MySqlZodbFactory.py (revision 63053) | |
@@ -128,10 +128,10 @@ | |
if socket: | |
connectionParams['unix_socket'] = socket | |
- kwargs = { | |
+ relstoreParams = { | |
'cache_module_name':'memcache', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh | |
############################################################################## | |
# | |
# Copyright (C) Zenoss, Inc. 2010, all rights reserved. | |
# | |
# This content is made available according to terms specified in | |
# License.zenoss under the directory where your Zenoss product is installed. | |
# | |
############################################################################## |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: /trunk/core/Products/ZenWidgets/skins/zenui/javascript/geomap.js | |
=================================================================== | |
--- /trunk/core/Products/ZenWidgets/skins/zenui/javascript/geomap.js (revision 62411) | |
+++ /trunk/core/Products/ZenWidgets/skins/zenui/javascript/geomap.js (revision 62520) | |
@@ -19,4 +19,5 @@ | |
var nodedata = null; | |
var linkdata = null; | |
+ var errorCount = 0; | |
/* PUBLICIZE */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: /trunk/core/Products/ZenModel/skins/zenmodel/maintenanceWindowDetail.pt | |
=================================================================== | |
--- /trunk/core/Products/ZenModel/skins/zenmodel/maintenanceWindowDetail.pt (revision 61079) | |
+++ /trunk/core/Products/ZenModel/skins/zenmodel/maintenanceWindowDetail.pt (revision 62820) | |
@@ -1,10 +1,8 @@ | |
<tal:block metal:use-macro="here/templates/macros/page2"> | |
<tal:block metal:fill-slot="contentPane"> | |
-<script type="text/javascript" src="/zport/portal_skins/zenmodel/datePicker.js"> | |
-</script> | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: /branches/core/zenoss-4.2.x/Products/ZenEvents/configure.zcml | |
=================================================================== | |
--- /branches/core/zenoss-4.2.x/Products/ZenEvents/configure.zcml (revision 52897) | |
+++ /branches/core/zenoss-4.2.x/Products/ZenEvents/configure.zcml (revision 67823) | |
@@ -9,5 +9,9 @@ | |
<include package=".browser"/> | |
- <subscriber handler=".zeneventd.onDaemonStartRun"/> | |
+ <subscriber handler=".zeneventdEvents.onSigTerm"/> | |
+ <subscriber handler=".zeneventdEvents.onSigUsr1"/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: /trunk/core/Products/ZenWidgets/skins/zenui/javascript/geomap.js | |
=================================================================== | |
--- /trunk/core/Products/ZenWidgets/skins/zenui/javascript/geomap.js (revision 62520) | |
+++ /trunk/core/Products/ZenWidgets/skins/zenui/javascript/geomap.js (revision 62633) | |
@@ -105,5 +105,5 @@ | |
this error when the user has reached their daily limit for their IP as well. | |
*/ | |
- errorCount++; | |
+ errorCount++; | |
if(errorCount >= 5){ |
OlderNewer