[3/3] git commit: updated refs/heads/4.2 to a797029

2013-11-21 Thread milamber
Update L10N strings from Transifex to repo Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a797029b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a797029b Diff: http://git-wip-us.apache.org/repos/asf/c

git commit: updated refs/heads/master to 386ee6b

2013-11-21 Thread jessicawang
Updated Branches: refs/heads/master 7b0cae602 -> 386ee6bf3 CLOUDSTACK-4793: UI > Virtual Routers > Select View > group by zone > listView of Zone, Total of Virtual Routers, Virtual Routers require upgrade. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip

git commit: updated refs/heads/4.3 to 8f62320

2013-11-21 Thread jessicawang
Updated Branches: refs/heads/4.3 5b5ec7fa3 -> 8f6232021 CLOUDSTACK-4793: UI > Virtual Routers > Select View > group by zone > listView of Zone, Total of Virtual Routers, Virtual Routers require upgrade. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us

git commit: updated refs/heads/rbac to 9d0d962

2013-11-21 Thread prachidamle
Updated Branches: refs/heads/rbac c3baf3ad7 -> 9d0d96225 more of account_type refactoring Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d0d9622 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d0d

git commit: updated refs/heads/master to 7b0cae6

2013-11-21 Thread jessicawang
Updated Branches: refs/heads/master e8ec75a2b -> 7b0cae602 CLOUDSTACK-4793: UI > Virtual Routers > add "Select View" dropdown on top of listView. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7b0cae60 Tree: ht

git commit: updated refs/heads/4.3 to 5b5ec7f

2013-11-21 Thread jessicawang
Updated Branches: refs/heads/4.3 592863f1e -> 5b5ec7fa3 CLOUDSTACK-4793: UI > Virtual Routers > add "Select View" dropdown on top of listView. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5b5ec7fa Tree: http:

git commit: updated refs/heads/4.3 to 592863f

2013-11-21 Thread alena1108
Updated Branches: refs/heads/4.3 5b4fa5c06 -> 592863f1e Removed unused agent lb timer Conflicts: engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos

[2/3] git commit: updated refs/heads/master to e8ec75a

2013-11-21 Thread alena1108
Resource metadata - support for VPC Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/602d4ef0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/602d4ef0 Diff: http://git-wip-us.apache.org/repos/asf/cloudsta

[1/3] git commit: updated refs/heads/master to e8ec75a

2013-11-21 Thread alena1108
Updated Branches: refs/heads/master b4282c214 -> e8ec75a2b Added missing @Inject to the ipAddressManager Conflicts: server/src/com/cloud/user/AccountManagerImpl.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudst

[3/3] git commit: updated refs/heads/master to e8ec75a

2013-11-21 Thread alena1108
Removed unused agent lb timer Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8ec75a2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8ec75a2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/dif

[62/69] [abbrv] git commit: updated refs/heads/ui-restyle to c05482b

2013-11-21 Thread bfederle
One more merge conflict Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de6bf747 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de6bf747 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de6b

[63/69] [abbrv] git commit: updated refs/heads/ui-restyle to c05482b

2013-11-21 Thread bfederle
CLOUDSTACK-1302: Allow cache_mode to be NULL in the database Not allowing this field to be NULL broke master due to the default data which gets loaded into the database during initial startup of the management server. During generation of the XML for the VM it will however default to 'none' if NU

[60/69] [abbrv] Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors fro

2013-11-21 Thread bfederle
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/433a6319/api/src/com/cloud/agent/api/to/VolumeTO.java -- diff --cc api/src/com/cloud/agent/api/to/VolumeTO.java index 4dec4d8,c9bb2f9..eb1d918 --- a/api/src/com/cloud/agent/api

[39/69] [abbrv] [partial] Reformatted all of the code.

2013-11-21 Thread bfederle
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java -- diff --git a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java b/api/t

[68/69] [abbrv] Merge branch 'master' into ui-restyle

2013-11-21 Thread bfederle
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c05482b8/client/WEB-INF/classes/resources/messages.properties -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c05482b8/ui/dictionary.jsp

[67/69] [abbrv] git commit: updated refs/heads/ui-restyle to c05482b

2013-11-21 Thread bfederle
System, main routers page: Split into subsections (WIP) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b4282c21 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b4282c21 Diff: http://git-wip-us.apache.or

[64/69] [abbrv] git commit: updated refs/heads/ui-restyle to c05482b

2013-11-21 Thread bfederle
Bump the debian package version to 4.4.0-snapshot Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b689e615 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b689e615 Diff: http://git-wip-us.apache.org/repo

[11/69] [abbrv] [partial] Reformatted all of the code.

2013-11-21 Thread bfederle
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/Status.java -- diff --git a/awsapi/src/com/amazon/s3/Status.java b/awsapi/src/com/amazon/s3/Status.java index 71eca24..74b4ae4 100644 --- a/a

[01/69] [abbrv] [partial] Reformatted all of the code.

2013-11-21 Thread bfederle
Updated Branches: refs/heads/ui-restyle 06ccb8473 -> c05482b88 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java -- diff --git a/engine/schema/src/co

[56/69] [abbrv] git commit: updated refs/heads/ui-restyle to c05482b

2013-11-21 Thread bfederle
Broke up some long strings Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/170f32f1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/170f32f1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1

[65/69] [abbrv] git commit: updated refs/heads/ui-restyle to c05482b

2013-11-21 Thread bfederle
List view: Support passing custom ID to detail view context For section select list views, if 'id' is specied under section: {}, then use that ID instead of the section's key ID. This allows sections to use i.e. the same ID as each other for a consistent context ID. Project: http://git-wip-us.ap

[57/69] [abbrv] git commit: updated refs/heads/ui-restyle to c05482b

2013-11-21 Thread bfederle
Add the upgrade path to all versions Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a414a85 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a414a85 Diff: http://git-wip-us.apache.org/repos/asf/cloudst

[52/69] [abbrv] git commit: updated refs/heads/ui-restyle to c05482b

2013-11-21 Thread bfederle
Add upgrade path from 4.3 to 4.4 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/036fffcd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/036fffcd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/

[54/69] [abbrv] Broke up some long strings

2013-11-21 Thread bfederle
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java -- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orche

[2/3] git commit: updated refs/heads/master to b4282c2

2013-11-21 Thread bfederle
System, main routers page: Split into subsections (WIP) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b4282c21 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b4282c21 Diff: http://git-wip-us.apache.or

[3/3] git commit: updated refs/heads/master to b4282c2

2013-11-21 Thread bfederle
List view: Support passing custom ID to detail view context For section select list views, if 'id' is specied under section: {}, then use that ID instead of the section's key ID. This allows sections to use i.e. the same ID as each other for a consistent context ID. Project: http://git-wip-us.ap

[3/3] git commit: updated refs/heads/4.3 to 5b4fa5c

2013-11-21 Thread bfederle
List view: Support passing custom ID to detail view context For section select list views, if 'id' is specied under section: {}, then use that ID instead of the section's key ID. This allows sections to use i.e. the same ID as each other for a consistent context ID. Project: http://git-wip-us.ap

[2/3] git commit: updated refs/heads/4.3 to 5b4fa5c

2013-11-21 Thread bfederle
System, main routers page: Split into subsections (WIP) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5b4fa5c0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5b4fa5c0 Diff: http://git-wip-us.apache.or

git commit: updated refs/heads/4.3 to cb14dad

2013-11-21 Thread alena1108
Updated Branches: refs/heads/4.3 98ed8b7e5 -> cb14dad75 Resource metadata - support for VPC Conflicts: api/src/com/cloud/server/ResourceTag.java server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Comm

[11/58] [abbrv] [partial] Reformatted all of the code.

2013-11-21 Thread ahuang
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/Status.java -- diff --git a/awsapi/src/com/amazon/s3/Status.java b/awsapi/src/com/amazon/s3/Status.java index 71eca24..74b4ae4 100644 --- a/a

[39/58] [abbrv] [partial] Reformatted all of the code.

2013-11-21 Thread ahuang
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java -- diff --git a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java b/api/t

[01/58] [abbrv] [partial] Reformatted all of the code.

2013-11-21 Thread ahuang
Updated Branches: refs/heads/master 3a414a850 -> 433a63191 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java -- diff --git a/engine/schema/src/com/cl

[57/58] [abbrv] Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors fro

2013-11-21 Thread ahuang
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/433a6319/api/src/com/cloud/agent/api/to/VolumeTO.java -- diff --cc api/src/com/cloud/agent/api/to/VolumeTO.java index 4dec4d8,c9bb2f9..eb1d918 --- a/api/src/com/cloud/agent/api

[1/2] git commit: updated refs/heads/master to 036fffc

2013-11-21 Thread widodh
Updated Branches: refs/heads/master 899e9f0d6 -> 036fffcd7 Revert "CLOUDSTACK-1302: Add cache mode to SQL upgrade file" This reverts commit 7f1168cec74c704257f2d6040cd352b240d5d299. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf

[2/2] git commit: updated refs/heads/master to 036fffc

2013-11-21 Thread widodh
Add upgrade path from 4.3 to 4.4 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/036fffcd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/036fffcd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/

git commit: updated refs/heads/4.3 to 98ed8b7

2013-11-21 Thread alena1108
Updated Branches: refs/heads/4.3 b792e5627 -> 98ed8b7e5 Added missing @Inject to the ipAddressManager Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/98ed8b7e Tree: http://git-wip-us.apache.org/repos/asf/cloudsta

git commit: updated refs/heads/master to b689e61

2013-11-21 Thread hugo
Updated Branches: refs/heads/master 308b7a5c3 -> b689e615c Bump the debian package version to 4.4.0-snapshot Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b689e615 Tree: http://git-wip-us.apache.org/repos/asf/c

[52/58] [abbrv] Broke up some long strings

2013-11-21 Thread ahuang
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java -- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orche

[54/58] [abbrv] git commit: updated refs/heads/master to 433a631

2013-11-21 Thread ahuang
Broke up some long strings Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/170f32f1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/170f32f1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1

[01/54] [abbrv] [partial] Reformatted all of the code.

2013-11-21 Thread ahuang
Updated Branches: refs/heads/reformat 023290670 -> 170f32f17 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/engine/schema/src/com/cloud/network/dao/PortProfileDaoImpl.java -- diff --git a/engine/schema/src/com/

[11/54] [abbrv] [partial] Reformatted all of the code.

2013-11-21 Thread ahuang
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/awsapi/src/com/amazon/s3/Status.java -- diff --git a/awsapi/src/com/amazon/s3/Status.java b/awsapi/src/com/amazon/s3/Status.java index 71eca24..74b4ae4 100644 --- a/a

[52/54] [abbrv] Broke up some long strings

2013-11-21 Thread ahuang
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170f32f1/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java -- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orche

[39/54] [abbrv] [partial] Reformatted all of the code.

2013-11-21 Thread ahuang
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d620df2b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java -- diff --git a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java b/api/t

[54/54] [abbrv] git commit: updated refs/heads/reformat to 170f32f

2013-11-21 Thread ahuang
Broke up some long strings Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/170f32f1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/170f32f1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1

[2/2] git commit: updated refs/heads/rbac to c3baf3a

2013-11-21 Thread mchen
Interface for QueryChecker adapter. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c3baf3ad Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c3baf3ad Diff: http://git-wip-us.apache.org/repos/asf/cloudstac

[1/2] git commit: updated refs/heads/rbac to c3baf3a

2013-11-21 Thread mchen
Updated Branches: refs/heads/rbac 7ed030115 -> c3baf3ad7 Change two static response views to Full and Restricted. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/81a794a5 Tree: http://git-wip-us.apache.org/repos/a

git commit: updated refs/heads/master to de6bf74

2013-11-21 Thread ahuang
Updated Branches: refs/heads/master 433a63191 -> de6bf7470 One more merge conflict Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de6bf747 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de6bf747 Di

git commit: updated refs/heads/master to 308b7a5

2013-11-21 Thread widodh
Updated Branches: refs/heads/master de6bf7470 -> 308b7a5c3 CLOUDSTACK-1302: Allow cache_mode to be NULL in the database Not allowing this field to be NULL broke master due to the default data which gets loaded into the database during initial startup of the management server. During generatio

[2/2] git commit: updated refs/heads/master to 3a414a8

2013-11-21 Thread hugo
Add the upgrade path to all versions Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a414a85 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a414a85 Diff: http://git-wip-us.apache.org/repos/asf/cloudst

git commit: updated refs/heads/reformat to 0232906

2013-11-21 Thread ahuang
Updated Branches: refs/heads/reformat 8d6274468 -> 023290670 Brought in Hugo's checkstyle Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/02329067 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0232

git commit: updated refs/heads/4.2 to 982c5ff

2013-11-21 Thread muralireddy
Updated Branches: refs/heads/4.2 2f308cc98 -> 982c5fffb CLOUDSTACK-5228: [API] [EIP/ELB enabled Zone] Need to display EIP address as "Public IP Address" for system VMs In system VM response object return EIP as public IP in case of basic zone with EIP service. Conflicts: server/src/co

git commit: updated refs/heads/master to 899e9f0

2013-11-21 Thread muralireddy
Updated Branches: refs/heads/master 8c6840e48 -> 899e9f0d6 CS-16962: [API] [EIP/ELB enabled Zone] Need to display EIP address as "Public IP Address" for system VMs In system VM response object return EIP as public IP in case of basic zone with EIP service. Conflicts: server/src/com/cl

git commit: updated refs/heads/master to 8c6840e

2013-11-21 Thread rajeshbattala
Updated Branches: refs/heads/master 6aafb9c50 -> 8c6840e48 Modified GetExternalVirtSwitch to take the switchname param and return the same or default one Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c6840e4

git commit: updated refs/heads/4.3 to b792e56

2013-11-21 Thread rajeshbattala
Updated Branches: refs/heads/4.3 b1e0f5014 -> b792e5627 Modified GetExternalVirtSwitch to take the switchname param and return the same or default one Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b792e562 Tre

git commit: updated refs/heads/master to 6aafb9c

2013-11-21 Thread likithas
Updated Branches: refs/heads/master 7f1168cec -> 6aafb9c50 CLOUDSTACK-5227. Cannot pass Japanese characters as parameter values to an API. During API check for control characters use pattern matching to avoid identifying all non-printable characters as control characters. Project: http://git

git commit: updated refs/heads/4.3 to b1e0f50

2013-11-21 Thread likithas
Updated Branches: refs/heads/4.3 b43b4b28b -> b1e0f5014 CLOUDSTACK-5227. Cannot pass Japanese characters as parameter values to an API. During API check for control characters use pattern matching to avoid identifying all non-printable characters as control characters. Project: http://git-wi

git commit: updated refs/heads/master to 7f1168c

2013-11-21 Thread widodh
Updated Branches: refs/heads/master 4f1821bf3 -> 7f1168cec CLOUDSTACK-1302: Add cache mode to SQL upgrade file This got lost in the previous commit Not sure though if this is the right file, since this feature won't make it into 4.3, but there is no 4.4 file. Project: http://git-wip-us.apac