git commit: refs/heads/master - CLOUDSTACK-1729: a partical resolution for user authenticators to unblock developers who are currently working on, for non-oss version

Updated Branches: refs/heads/master 6bc12fa66 -> 4faad73d6 CLOUDSTACK-1729: a partical resolution for user authenticators to unblock developers who are currently working on, for non-oss version Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-

git commit: refs/heads/master - CLOUDSTACK-1729: a partical resolution for user authenticators to unblock developers who are currently working on and relying on the fix

Updated Branches: refs/heads/master 1ea5d6c16 -> 2bebb124c CLOUDSTACK-1729: a partical resolution for user authenticators to unblock developers who are currently working on and relying on the fix Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wi

git commit: refs/heads/master - CLOUDSTACK-1568, CLOUDSTACK-1664: Fix ActionEvent interception and optimize @DB lookup with caching

Updated Branches: refs/heads/master d9b85e397 -> fb94b7221 CLOUDSTACK-1568,CLOUDSTACK-1664: Fix ActionEvent interception and optimize @DB lookup with caching Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cl

git commit: refs/heads/master - CLOUDSTACK-1655: A regression in ConsoleProxy caused by deprecating old URL form

Updated Branches: refs/heads/master d55560a62 -> bf15eb0c7 CLOUDSTACK-1655: A regression in ConsoleProxy caused by deprecating old URL form Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bf1

[3/3] git commit: refs/heads/master - CLOUDSTACK-1624: Initialize configuration variables properly to avoid influence of any racing conditions

Updated Branches: refs/heads/4.1 996b57a42 -> 85198980c refs/heads/master 0ca85659a -> d55560a62 CLOUDSTACK-1624: Initialize configuration variables properly to avoid influence of any racing conditions Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http:

[1/3] git commit: refs/heads/4.1 - CLOUDSTACK-1267: Configure log4j in proper place so that it can be initialized correctly in KVM and system VM environment

CLOUDSTACK-1267: Configure log4j in proper place so that it can be initialized correctly in KVM and system VM environment Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8a99fb34 Tree: http://gi

[2/3] git commit: refs/heads/4.1 - CLOUDSTACK-1624: Initialize configuration variables properly to avoid influence of any racing conditions

CLOUDSTACK-1624: Initialize configuration variables properly to avoid influence of any racing conditions Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/85198980 Tree: http://git-wip-us.apache.o

git commit: refs/heads/master - CLOUDSTACK-1267: Configure log4j in proper place so that it can be initialized correctly in KVM and system VM environment

Updated Branches: refs/heads/master 9f7b82281 -> c235d029c CLOUDSTACK-1267: Configure log4j in proper place so that it can be initialized correctly in KVM and system VM environment Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org

git commit: refs/heads/master - CLOUDSTACK-1615: instead of returning empty host firewall ruleset, ESXi 5.0 Update 1 may return null to indicate empty host firewall ruleset, Cloudstack needs to handle

Updated Branches: refs/heads/master bab6839f3 -> 47db92427 CLOUDSTACK-1615: instead of returning empty host firewall ruleset, ESXi 5.0 Update 1 may return null to indicate empty host firewall ruleset, Cloudstack needs to handle this changed behave Project: http://git-wip-us.apache.org/repos

[3/3] git commit: refs/heads/4.1 - CLOUDSTACK-1615: instead of returning empty host firewall ruleset, ESXi 5.0 Update 1 may return null to indicate empty host firewall ruleset, Cloudstack needs to han

Updated Branches: refs/heads/4.1 889e76bf6 -> 0f000ad4f CLOUDSTACK-1615: instead of returning empty host firewall ruleset, ESXi 5.0 Update 1 may return null to indicate empty host firewall ruleset, Cloudstack needs to handle this changed behave Project: http://git-wip-us.apache.org/repos/as

[2/3] git commit: refs/heads/4.1 - CLOUDSTACK-1323: retire some of no-longer used files

CLOUDSTACK-1323: retire some of no-longer used files Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/00f63c44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/00f63c44 Diff:

[1/3] git commit: refs/heads/4.1 - Disable acceptence of old-fashion URL form for console access

Disable acceptence of old-fashion URL form for console access Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ddefdbfc Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ddefd

git commit: refs/heads/master - Disable acceptence of old-fashion URL form for console access

Updated Branches: refs/heads/master 409ec9c6b -> 37bab18c6 Disable acceptence of old-fashion URL form for console access Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/37bab18c Tree: http://

git commit: refs/heads/master - CLOUDSTACK-1562: Replace @DB support to be the formal implementation instead of a temporary hacking one

Updated Branches: refs/heads/master 837f7e195 -> 89f4ac043 CLOUDSTACK-1562: Replace @DB support to be the formal implementation instead of a temporary hacking one Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubat

[2/7] git commit: refs/heads/master - CLOUDSTACK-1362: Put a workaround fix to set excutable attribute of injectkys.sh at runtime

CLOUDSTACK-1362: Put a workaround fix to set excutable attribute of injectkys.sh at runtime Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/72e6fd6e Tree: http://git-wip-us.apache.org/repos/asf/

[1/7] git commit: refs/heads/master - CLOUDSTACK-1173: fix the regression caused by life-cycle management changes

CLOUDSTACK-1173: fix the regression caused by life-cycle management changes Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3f2b771e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudst

[3/7] CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB us

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/333dd810/server/src/com/cloud/network/NetworkServiceImpl.java -- diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/Net

[6/7] git commit: refs/heads/master - Make RecreatableFencer's constructor public so that it can instantiated through reflection

Make RecreatableFencer's constructor public so that it can instantiated through reflection Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f077fd9b Tree: http://git-wip-us.apache.org/repos/asf/i

[7/7] git commit: refs/heads/master - Fix an out-dated unit test assertion

Updated Branches: refs/heads/master 7602997b9 -> 0b84958a6 Fix an out-dated unit test assertion Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0b84958a Tree: http://git-wip-us.apache.org/rep

git commit: refs/heads/master - CLOUDSTACK-1262: update default built-in systemvm.iso search patch to be consistent with RPM location

Updated Branches: refs/heads/master 6317f0bd3 -> cec4d8b59 CLOUDSTACK-1262: update default built-in systemvm.iso search patch to be consistent with RPM location Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator

git commit: refs/heads/4.1 - CLOUDSTACK-1455: fix the wiring for dynamically created objects

Updated Branches: refs/heads/4.1 2093aefcb -> 15bcb0e0c CLOUDSTACK-1455: fix the wiring for dynamically created objects Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/15bcb0e0 Tree: http://g

git commit: refs/heads/4.1 - CLOUDSTACK-1252: Fix the issue of locating systemvm patch ISO under VMware environment

Updated Branches: refs/heads/4.1 336d133f9 -> ccc51147a CLOUDSTACK-1252: Fix the issue of locating systemvm patch ISO under VMware environment Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit

git commit: refs/heads/4.1 - CLOUDSTACK-1173: fix the regression caused by life-cycle management changes

Updated Branches: refs/heads/4.1 62d7dc9d3 -> df8c7506f CLOUDSTACK-1173: fix the regression caused by life-cycle management changes Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/df8c7506 Tr

[1/2] CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB us

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4f38d745/utils/src/com/cloud/utils/db/GenericDaoBase.java -- diff --git a/utils/src/com/cloud/utils/db/GenericDaoBase.java b/utils/src/com/cloud/utils/db/GenericDaoB

git commit: refs/heads/4.1 - CLOUDSTACK-1362: Put a workaround fix to set excutable attribute of injectkys.sh at runtime

Updated Branches: refs/heads/4.1 aea5b268b -> e219ef951 CLOUDSTACK-1362: Put a workaround fix to set excutable attribute of injectkys.sh at runtime Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/c

git commit: refs/heads/4.1 - CLOUDSTACK-1333: enable logging at Spring startup phase

Updated Branches: refs/heads/4.1 f91bf6b73 -> cc58b7b85 CLOUDSTACK-1333: enable logging at Spring startup phase Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cc58b7b8 Tree: http://git-wip-u

git commit: refs/heads/master - CLOUDSTACK-1333: enable logging at Spring startup phase

Updated Branches: refs/heads/master 4d80b71ec -> 73d5926d0 CLOUDSTACK-1333: enable logging at Spring startup phase Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/73d5926d Tree: http://git-wi

git commit: refs/heads/master - CloudStack-1267: initialize log4j in agent main()

Updated Branches: refs/heads/master 817548bac -> 2b76114bb CloudStack-1267: initialize log4j in agent main() Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2b76114b Tree: http://git-wip-us.a

git commit: refs/heads/4.1 - CloudStack-1267: initialize log4j in agent main()

Updated Branches: refs/heads/4.1 81db0c207 -> f91bf6b73 CloudStack-1267: initialize log4j in agent main() Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f91bf6b7 Tree: http://git-wip-us.apac

git commit: refs/heads/master - Avoid using strong-type-safe in Java generics provided only by higher version JDK compilers, make it more friendly to old-fashion 1.5 javac compiler

Updated Branches: refs/heads/master 78b00f51a -> c67b9c965 Avoid using strong-type-safe in Java generics provided only by higher version JDK compilers, make it more friendly to old-fashion 1.5 javac compiler Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: h

git commit: refs/heads/4.1 - CLOUDSTACK-1165, fix nonoss build startup issue

Updated Branches: refs/heads/4.1 5c7ab24b8 -> 2a63dbe59 CLOUDSTACK-1165, fix nonoss build startup issue Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2a63dbe5 Tree: http://git-wip-us.apache

git commit: refs/heads/master - CLOUDSTACK-1165, fix nonoss build startup issue

Updated Branches: refs/heads/master 303fb650c -> e5866cf2e CLOUDSTACK-1165, fix nonoss build startup issue Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e5866cf2 Tree: http://git-wip-us.apa

git commit: refs/heads/master - Fix the unsolved conflicts for doc build

Updated Branches: refs/heads/master e74f72be3 -> 8f70ee08e Fix the unsolved conflicts for doc build Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8f70ee08 Tree: http://git-wip-us.apache.org

[1/50] [abbrv] git commit: refs/heads/master - forget to check in code

forget to check in code Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cb25eed3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cb25eed3 Diff: http://git-wip-us.apache.org

[2/50] [abbrv] git commit: refs/heads/master - fix compile

fix compile Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a18baf8c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a18baf8c Diff: http://git-wip-us.apache.org/repos/asf/i

[16/50] [abbrv] git commit: refs/heads/master - CloudStack CLOUDSTACK-723 Enhanced baremetal servers support on Cisco UCS

CloudStack CLOUDSTACK-723 Enhanced baremetal servers support on Cisco UCS Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/997e9fb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstac

[6/50] [abbrv] git commit: refs/heads/master - Put nonoss under Spring framework

Put nonoss under Spring framework Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/af4485ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/af4485ae Diff: http://git-wip-us.

[3/50] [abbrv] git commit: refs/heads/master - set local storage as up

set local storage as up Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e9bca76a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e9bca76a Diff: http://git-wip-us.apache.org

[9/50] [abbrv] git commit: refs/heads/master - test_vm_life_cycle: Fix expunging logic as in mgmt server

test_vm_life_cycle: Fix expunging logic as in mgmt server Sets expunge interval to 600 if it's less than that Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bc40ed8

[11/50] [abbrv] git commit: refs/heads/master - Put usage server under Spring

Put usage server under Spring Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/14505479 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/14505479 Diff: http://git-wip-us.apac

[14/50] [abbrv] git commit: refs/heads/master - client: Fix maven to replace nonoss spring ctx xml for nonoss build

client: Fix maven to replace nonoss spring ctx xml for nonoss build Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4c1a69ac Tree: http://git-wip-us.apache.org/repos/

[5/50] [abbrv] git commit: refs/heads/master - CloudStack CLOUDSTACK-723 Enhanced baremetal servers support on Cisco UCS

CloudStack CLOUDSTACK-723 Enhanced baremetal servers support on Cisco UCS init Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/301b0b90 Tree: http://git-wip-us.apache.org/repos/asf/incubator-clo

[7/50] [abbrv] git commit: refs/heads/master - Add nonossComponentContext.xml.in for nooss composition of CloudStack

Add nonossComponentContext.xml.in for nooss composition of CloudStack Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2b67fc84 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tr

[8/50] [abbrv] git commit: refs/heads/master - Make nonoss build work under Spring

Make nonoss build work under Spring Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/767f54cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/767f54cc Diff: http://git-wip-u

[4/50] [abbrv] git commit: refs/heads/master - Fix a bug in listHosts that returns wrong zoneId for host.(cherry picked from commit 17c419ceb4979ebef0cb756ad6ed15e5c95dfbd4)

Fix a bug in listHosts that returns wrong zoneId for host.(cherry picked from commit 17c419ceb4979ebef0cb756ad6ed15e5c95dfbd4) Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudsta

[10/50] [abbrv] git commit: refs/heads/master - test_vm_life_cycle: Consider 600s threshold for expunge.delay as per server logic

test_vm_life_cycle: Consider 600s threshold for expunge.delay as per server logic Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/221ac72a Tree: http://git-wip-us.ap

[30/50] [abbrv] Merge latest master into javelin

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1b2b369e/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java -- diff --cc server/src/com/cloud/network/router/VirtualNetworkApplianceManagerI

[23/50] [abbrv] Improve component lifecycle management with system run-level concept

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/17652325/server/test/com/cloud/vpc/MockVpcManagerImpl.java -- diff --git a/server/test/com/cloud/vpc/MockVpcManagerImpl.java b/server/test/com/cloud/vpc/MockVpcManag

[18/50] [abbrv] git commit: refs/heads/master - CloudStack CLOUDSTACK-723 Enhanced baremetal servers support on Cisco UCS

CloudStack CLOUDSTACK-723 Enhanced baremetal servers support on Cisco UCS Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1a1d716d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstac

[17/50] [abbrv] git commit: refs/heads/master - cli: Show filter only when a subject is specified in autocompletion

cli: Show filter only when a subject is specified in autocompletion Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7ea83b82 Tree: http://git-wip-us.apache.org/repos/

[12/50] [abbrv] git commit: refs/heads/master - test_vm_life_cycle: Don't wait a lot poll for change every expunge_cycle interval

test_vm_life_cycle: Don't wait a lot poll for change every expunge_cycle interval Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a4c778e1 Tree: http://git-wip-us.ap

[15/50] [abbrv] git commit: refs/heads/master - Spring changes in awsapi

Spring changes in awsapi Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2bfdce02 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2bfdce02 Diff: http://git-wip-us.apache.or

[13/50] [abbrv] git commit: refs/heads/master - Merge branch 'master' into javelin

Merge branch 'master' into javelin Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2fb346ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2fb346ab Diff: http://git-wip-us

[21/50] [abbrv] git commit: refs/heads/master - maven: fix axis2 version to 1.5.6 fixes starting issue with awsapi

maven: fix axis2 version to 1.5.6 fixes starting issue with awsapi Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1e0709d1 Tree: http://git-wip-us.apache.org/repos/a

[27/50] [abbrv] git commit: refs/heads/master - Spring hack for Ec2RestServlet

Spring hack for Ec2RestServlet Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4dc63f50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4dc63f50 Diff: http://git-wip-us.apa

[28/50] [abbrv] git commit: refs/heads/master - Fix awsapi issues in Spring wiring

Fix awsapi issues in Spring wiring Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/526bb01b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/526bb01b Diff: http://git-wip-us

[22/50] [abbrv] git commit: refs/heads/master - Remove temporary hacking and use Official way to wire-up servlet with injection under Spring

Remove temporary hacking and use Official way to wire-up servlet with injection under Spring Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/da2e6461 Tree: http://git-wip-us.apache.org/repos/asf

[29/50] [abbrv] git commit: refs/heads/master - more change to fix awsapi deployment with maven and jetty and Spring

more change to fix awsapi deployment with maven and jetty and Spring Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3c75d53f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tre

[34/50] [abbrv] git commit: refs/heads/master - Merge branch 'ucs' into javelin

Merge branch 'ucs' into javelin Conflicts: api/src/org/apache/cloudstack/api/ApiConstants.java plugins/pom.xml utils/src/com/cloud/utils/exception/CloudRuntimeException.java utils/src/com/cloud/utils/exception/RuntimeCloudException.java Project: http://git-wip-us.

[39/50] [abbrv] git commit: refs/heads/master - Sync javelin with master up to 894cb8f7d9fc8b5561754a9fa541fef8f235148a

Sync javelin with master up to 894cb8f7d9fc8b5561754a9fa541fef8f235148a Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7bd8bec6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/

[36/50] [abbrv] Sync javelin with master up to 894cb8f7d9fc8b5561754a9fa541fef8f235148a

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7bd8bec6/server/test/com/cloud/vpc/MockNetworkModelImpl.java -- diff --cc server/test/com/cloud/vpc/MockNetworkModelImpl.java index 312f9e6,000..8097c34 mode 1006

[20/50] [abbrv] git commit: refs/heads/master - Put a tempoary fix to awsapi to workaround an issue with jetty/Spring integration limitation

Put a tempoary fix to awsapi to workaround an issue with jetty/Spring integration limitation Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b5deb52f Tree: http://git-wip-us.apache.org/repos/asf

[45/50] [abbrv] Merge javelin into master

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/296c2033/server/src/com/cloud/server/ConfigurationServerImpl.java -- diff --cc server/src/com/cloud/server/ConfigurationServerImpl.java index ebf140f,fa68514..5fa4c60

[19/50] [abbrv] git commit: refs/heads/master - CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name

CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8887f01b Tree: http://git-wip-us.apache.org/repos/asf/incubator

[35/50] [abbrv] git commit: refs/heads/master - Restore old caching policy on DAOs under Spring configuration

Restore old caching policy on DAOs under Spring configuration Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/64d794ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/64d79

[40/50] [abbrv] Sync master to javelin one more time

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7b75f0d9/server/test/resources/VpcApiUnitTestContext.xml -- diff --cc server/test/resources/VpcApiUnitTestContext.xml index 000,000..d933022 new file mode 100

[50/50] [abbrv] git commit: refs/heads/master - Fix the merge conflicts

Updated Branches: refs/heads/master 631b6fd46 -> e74f72be3 Fix the merge conflicts Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e74f72be Tree: http://git-wip-us.apache.org/repos/asf/incuba

[47/50] [abbrv] Merge javelin into master

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/296c2033/server/src/com/cloud/cluster/ClusterManagerImpl.java -- diff --cc server/src/com/cloud/cluster/ClusterManagerImpl.java index 465f384,df62eed..45d9dca --- a/s

[1/50] [abbrv] git commit: refs/heads/javelin - propogate account changes to other Regions

propogate account changes to other Regions Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4ea36b82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4ea36b82 Diff: http://gi

[9/50] [abbrv] Added Mock ApiServer, Regions API calls with api keys

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0f33bf4/server/src/com/cloud/api/MockApiServer.java -- diff --git a/server/src/com/cloud/api/MockApiServer.java b/server/src/com/cloud/api/MockApiServer.java new fi

[7/50] [abbrv] Added Mock ApiServer, Regions API calls with api keys

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f0f33bf4/server/test/com/cloud/network/security/MockSecurityGroupManagerImpl.java -- diff --git a/server/test/com/cloud/network/security/MockSecurityGroupManagerImpl

[3/50] [abbrv] updated regions branch with changes from master

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4fcf64dd/api/src/com/cloud/api/ApiConstants.java -- diff --cc api/src/com/cloud/api/ApiConstants.java index b5e6002,00ec392..16c33c5 --- a/api/src/com/cloud/api/ApiCo

[11/50] [abbrv] git commit: refs/heads/javelin - Add Mock managers for Regio API server

Add Mock managers for Regio API server Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c40aac0a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c40aac0a Diff: http://git-wi

[13/50] [abbrv] Apply API refactoring changes. Make changes to Regions API to work with new code

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1f57d925/server/src/com/cloud/api/ApiResponseHelper.java -- diff --cc server/src/com/cloud/api/ApiResponseHelper.java index 6b84ac0,1965f33..cae27bd --- a/server/src/

[12/50] [abbrv] git commit: refs/heads/javelin - temp changes

temp changes Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f365426b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f365426b Diff: http://git-wip-us.apache.org/repos/asf/

[5/50] [abbrv] Merge branch 'master' into regions

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/89779cce/api/src/com/cloud/api/ApiConstants.java -- diff --cc api/src/com/cloud/api/ApiConstants.java index 16c33c5,067ddf7..e311fcc --- a/api/src/com/cloud/api/ApiCo

[21/50] [abbrv] git commit: refs/heads/javelin - remove finduser, findaccount, finddomain APIs

remove finduser, findaccount, finddomain APIs Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/def9fd1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/def9fd1f Diff: http:/

[24/50] [abbrv] git commit: refs/heads/javelin - Add sync entry to region_sunc table on region api failure

Add sync entry to region_sunc table on region api failure Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/158ee8b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/158ee8b2

[20/50] [abbrv] git commit: refs/heads/javelin - added missing bracket

added missing bracket Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cd9e4e99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cd9e4e99 Diff: http://git-wip-us.apache.org/r

[22/50] [abbrv] removed MockAPI server

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ea660cd0/server/test/com/cloud/storage/MockStorageManagerImpl.java -- diff --git a/server/test/com/cloud/storage/MockStorageManagerImpl.java b/server/test/com/cloud/

[25/50] [abbrv] git commit: refs/heads/javelin - Merge branch 'master' into regions

Merge branch 'master' into regions Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d3089ba2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d3089ba2 Diff: http://git-wip-us

[33/50] [abbrv] git commit: refs/heads/javelin - Merge branch 'master' into regions

Merge branch 'master' into regions Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c607e03f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c607e03f Diff: http://git-wip-us

[26/50] [abbrv] git commit: refs/heads/javelin - Add sync entry to region_sunc table on region api failure

Add sync entry to region_sunc table on region api failure Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/60fd29da Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/60fd29da

[32/50] [abbrv] git commit: refs/heads/javelin - Added unit tests

Added unit tests Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e7341313 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e7341313 Diff: http://git-wip-us.apache.org/repos/

[19/50] [abbrv] git commit: refs/heads/javelin - Merge branch 'master' into regions

Merge branch 'master' into regions Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c6ae19d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c6ae19d1 Diff: http://git-wip-us

[31/50] [abbrv] git commit: refs/heads/javelin - Added RegionServiceImpl to DefaultComponentLibrary

Added RegionServiceImpl to DefaultComponentLibrary Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c17c7007 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c17c7007 Diff: h

[40/50] [abbrv] git commit: refs/heads/javelin - IPv6: Add missing license header

IPv6: Add missing license header Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c0b18c76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c0b18c76 Diff: http://git-wip-us.a

[34/50] [abbrv] git commit: refs/heads/javelin - Fixed listRegions serach by id, name

Fixed listRegions serach by id, name Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a33d8f96 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a33d8f96 Diff: http://git-wip-

[27/50] [abbrv] git commit: refs/heads/javelin - Add sync entry to region_sunc table on region api failure

Add sync entry to region_sunc table on region api failure Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e848a937 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e848a937

[35/50] [abbrv] Merging events framework branch into master. This commit will bring following changes

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e7a554fc/tools/whisker/LICENSE -- diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE index 7efac5c..025cb33 100644 --- a/tools/whisker/LICENSE +++ b/tools/whi

[41/50] [abbrv] git commit: refs/heads/javelin - CLOUDSTACK-686: Modified unique constraint to include physical_network_id

CLOUDSTACK-686: Modified unique constraint to include physical_network_id Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/33b87d89 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstac

[45/50] [abbrv] git commit: refs/heads/javelin - Merge branch 'master' into regions

Merge branch 'master' into regions Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4f53eb11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4f53eb11 Diff: http://git-wip-us

[44/50] [abbrv] git commit: refs/heads/javelin - adding apache license heders to the files that are faling RAT check

adding apache license heders to the files that are faling RAT check Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1a348c85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree

[42/50] [abbrv] git commit: refs/heads/javelin - Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Conflicts: server/src/com/cloud/network/NetworkManagerImpl.java Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloud

[43/50] [abbrv] git commit: refs/heads/javelin - Merge branch 'master' into regions

Merge branch 'master' into regions Conflicts: client/tomcatconf/components.xml.in server/src/com/cloud/api/ApiResponseHelper.java Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/

[46/50] [abbrv] Sync master to javelin one more time

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7b75f0d9/server/test/resources/VpcApiUnitTestContext.xml -- diff --cc server/test/resources/VpcApiUnitTestContext.xml index 000,000..d933022 new file mode 100

[25/43] git commit: refs/heads/javelin - IPv6: Fix missed AddressFormat in nic table

IPv6: Fix missed AddressFormat in nic table Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f45576bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f45576bc Diff: http://g

[16/43] git commit: refs/heads/javelin - IPv6: Update NetworkResponse and NicResponse

IPv6: Update NetworkResponse and NicResponse Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b1972f6c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b1972f6c Diff: http://

[15/43] git commit: refs/heads/javelin - IPv6: Make the IPv6 input all lowercase

IPv6: Make the IPv6 input all lowercase To make them consistent. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/85d0546f Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8

[27/43] git commit: refs/heads/javelin - IPv6: Check startipv6, endipv6 and ip6Gateway with ip range

IPv6: Check startipv6, endipv6 and ip6Gateway with ip range Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ed777bb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ed777bb

  1   2   3   4   5   >