You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mt...@apache.org on 2015/07/31 07:25:04 UTC
[1/3] git commit: updated refs/heads/master to e640e0c
Repository: cloudstack
Updated Branches:
refs/heads/master c9857cae2 -> e640e0cf6
Correcting an issue that was introduced with b84093f691ae0b09d2c525d50f2e2d200c709b2c
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/406c2c00
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/406c2c00
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/406c2c00
Branch: refs/heads/master
Commit: 406c2c00b267483ef6fe6c84b9a187458662cb9f
Parents: c9857ca
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Thu Jul 30 17:29:32 2015 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Thu Jul 30 18:24:58 2015 -0600
----------------------------------------------------------------------
.../datastore/db/PrimaryDataStoreDaoImpl.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/406c2c00/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
index d3c29f7..9d97cfb 100644
--- a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
+++ b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
@@ -380,7 +380,6 @@ public class PrimaryDataStoreDaoImpl extends GenericDaoBase<StoragePoolVO, Long>
@Override
public List<StoragePoolVO> findZoneWideStoragePoolsByTags(long dcId, String[] tags) {
- List<StoragePoolVO> storagePools = null;
if (tags == null || tags.length == 0) {
QueryBuilder<StoragePoolVO> sc = QueryBuilder.create(StoragePoolVO.class);
sc.and(sc.entity().getDataCenterId(), Op.EQ, dcId);
@@ -399,17 +398,20 @@ public class PrimaryDataStoreDaoImpl extends GenericDaoBase<StoragePoolVO, Long>
sql.append(ZoneWideDetailsSqlSuffix);
TransactionLegacy txn = TransactionLegacy.currentTxn();
try (PreparedStatement pstmt = txn.prepareStatement(sql.toString());){
- int i=0;
- for (Map.Entry<String, String> detail : details.entrySet()) {
- pstmt.setString(++i,detail.getKey());
- pstmt.setString(++i,detail.getValue());
- }
List<StoragePoolVO> pools = new ArrayList<StoragePoolVO>();
if (pstmt != null) {
- i = 1;
+ int i = 1;
+
pstmt.setLong(i++, dcId);
pstmt.setString(i++, ScopeType.ZONE.toString());
+
+ for (Map.Entry<String, String> detail : details.entrySet()) {
+ pstmt.setString(i++, detail.getKey());
+ pstmt.setString(i++, detail.getValue());
+ }
+
pstmt.setInt(i++, details.size());
+
try(ResultSet rs = pstmt.executeQuery();) {
while (rs.next()) {
pools.add(toEntityBean(rs, false));
[3/3] git commit: updated refs/heads/master to e640e0c
Posted by mt...@apache.org.
Setup = noun form / Set up = verb form
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e640e0cf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e640e0cf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e640e0cf
Branch: refs/heads/master
Commit: e640e0cf6eb9508f74f9bad59519f7189da7d82e
Parents: c023027
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Thu Jul 30 23:03:23 2015 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Thu Jul 30 23:03:23 2015 -0600
----------------------------------------------------------------------
client/WEB-INF/classes/resources/messages.properties | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e640e0cf/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index dcbf6c8..f81a196 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1092,8 +1092,8 @@ label.service.capabilities=Service Capabilities
label.service.offering=Service Offering
label.session.expired=Session Expired
label.set.up.zone.type=Set up zone type
-label.setup.network=Setup Network
-label.setup.zone=Setup Zone
+label.setup.network=Set up Network
+label.setup.zone=Set up Zone
label.setup=Setup
label.shared=Shared
label.SharedMountPoint=SharedMountPoint
@@ -1105,7 +1105,7 @@ label.skip.guide=I have used CloudStack before, skip this guide
label.snapshot.limits=Snapshot Limits
label.snapshot.name=Snapshot Name
label.snapshot.s=Snapshots
-label.snapshot.schedule=Setup Recurring Snapshot
+label.snapshot.schedule=Set up Recurring Snapshot
label.snapshot=Snapshot
label.snapshots=Snapshots
label.source.nat=Source NAT
@@ -1915,7 +1915,7 @@ message.select.template=Please select a template for your new virtual instance.
message.setup.physical.network.during.zone.creation.basic=When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>drag and drop</strong> other traffic types onto the physical network.
message.setup.physical.network.during.zone.creation=When adding an advanced zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the hypervisor. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined.<br/><br/><strong>Drag and drop one or more traffic types</strong> onto each physical network.
message.setup.successful=Cloud setup successful\!
-message.snapshot.schedule=You can setup recurring snapshot schedules by selecting from the available options below and applying your policy preference
+message.snapshot.schedule=You can set up recurring snapshot schedules by selecting from the available options below and applying your policy preference
message.specify.url=Please specify URL
message.step.1.continue=Please select a template or ISO to continue
message.step.1.desc=Please select a template for your new virtual instance. You can also choose to select a blank template from which an ISO image can be installed onto.
[2/3] git commit: updated refs/heads/master to e640e0c
Posted by mt...@apache.org.
Changing text "Snapshot(s)" to "Snapshots"
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c0230273
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c0230273
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c0230273
Branch: refs/heads/master
Commit: c0230273cdbdf2558f4a0802d177bd5757de34fd
Parents: 406c2c0
Author: Mike Tutkowski <mi...@solidfire.com>
Authored: Thu Jul 30 22:59:05 2015 -0600
Committer: Mike Tutkowski <mi...@solidfire.com>
Committed: Thu Jul 30 22:59:05 2015 -0600
----------------------------------------------------------------------
client/WEB-INF/classes/resources/messages.properties | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0230273/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 701582c..dcbf6c8 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1104,7 +1104,7 @@ label.size=Size
label.skip.guide=I have used CloudStack before, skip this guide
label.snapshot.limits=Snapshot Limits
label.snapshot.name=Snapshot Name
-label.snapshot.s=Snapshot(s)
+label.snapshot.s=Snapshots
label.snapshot.schedule=Setup Recurring Snapshot
label.snapshot=Snapshot
label.snapshots=Snapshots
@@ -2106,7 +2106,6 @@ label.zone.name=Zone Name
label.instances=Instances
label.event=Event
label.minutes.past.hour=minutes(s) past the hour
-label.snapshots=snapshot(s)
label.time.colon=Time:
label.min.past.the.hr=min past the hr
label.timezone.colon=Timezone: