Branch: refs/heads/jshaughn/storage
Home: https://github.com/rhq-project/rhq
Commit: 710c93131f44dc32ab7397dafdec23c086dc2758
https://github.com/rhq-project/rhq/commit/710c93131f44dc32ab7397dafdec23c08…
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-03-21 (Fri, 21 Mar 2014)
Changed paths:
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
Log Message:
-----------
Make sure StorageNode is committed before we try and deploy it.
Branch: refs/heads/jshaughn/storage
Home: https://github.com/rhq-project/rhq
Commit: b6e70d104756db633df7b4ff642c29e3fad81d2b
https://github.com/rhq-project/rhq/commit/b6e70d104756db633df7b4ff642c29e3f…
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-03-21 (Fri, 21 Mar 2014)
Changed paths:
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java
Log Message:
-----------
Transaction delimiters have been updatedin StorageNode beans to try and prevent
db-locking issues. This caused a problem for storage node deployment
during mergeInventory, because it relied on an umbrella transaction providing
a persisted (but not yet committed) Resource.
Added a general mechanism for performing post-commit actions on newly
merged resources and leveraged it to perform linking a StorageNode to a
Resource.
Branch: refs/heads/master
Home: https://github.com/rhq-project/rhq
Commit: eca4d472c4a98f8a560b7dd00810dafb6326a2bc
https://github.com/rhq-project/rhq/commit/eca4d472c4a98f8a560b7dd00810dafb6…
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-03-21 (Fri, 21 Mar 2014)
Changed paths:
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java
M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java
Log Message:
-----------
[BZ 1069688] - (JON3-24) Add alert name filter to "Recent Alerts" dashboard portlet - Filtering now works for dashboard portlet (called "Recent Alerts") as well as for the "Summary/Activity" subtab portlet (called "Resource: Alerts" and "Group: Alerts")
Branch: refs/heads/jshaughn/storage
Home: https://github.com/rhq-project/rhq
Commit: 4921949e2e203015cf09f699b5d7a1352daab3a0
https://github.com/rhq-project/rhq/commit/4921949e2e203015cf09f699b5d7a1352…
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: 2014-03-20 (Thu, 20 Mar 2014)
Changed paths:
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java
M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java
Log Message:
-----------
[1079027] Storage Node (un)deployment can cause deadlock in rhq_storage_node table
Initial commit that attempts to remove umbrella transactions starting at
many entry points, such that scheduling operations happens in their own
trans context. Needs review and testing...
Branch: refs/heads/release/jon3.1.x
Home: https://github.com/rhq-project/rhq
Commit: d9408566e506a8003f38a5fde275166a818f39e5
https://github.com/rhq-project/rhq/commit/d9408566e506a8003f38a5fde275166a8…
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: 2014-03-19 (Wed, 19 Mar 2014)
Changed paths:
M modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java
Log Message:
-----------
Bug 1077387 - [hotfix] If bundle destination path contains a symbolic link, relative paths specified in bundle recipe may resolve to incorrect parent
Work around usage of NIO2 toPath method in FileUtilTest
Branch: refs/heads/release/jon3.1.x
Home: https://github.com/rhq-project/rhq
Commit: c675e20567a28440120d0f512a4e1e9b67f59371
https://github.com/rhq-project/rhq/commit/c675e20567a28440120d0f512a4e1e9b6…
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: 2014-03-19 (Wed, 19 Mar 2014)
Changed paths:
M modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java
M modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentData.java
M modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java
A modules/core/util/src/test/java/org/rhq/core/util/updater/DeployerCanonicalPathTest.java
Log Message:
-----------
Bug 1077387 - [hotfix] If bundle destination path contains a symbolic link, relative paths specified in bundle recipe may resolve to incorrect parent
(cherry picked from commit a8472635e28dcdc053e5d3d4a700d5cd8c60e752)
Remove unused NIO2 imports from FileUtil
Changed NIO2 code from DeployerCanonicalPathTest (the test case will be only run on systems having /usr/bin/ln)
Conflicts:
modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentData.java
modules/core/util/src/test/java/org/rhq/core/util/updater/DeployerCanonicalPathTest.java