cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [50/50] [abbrv] git commit: updated refs/heads/marvin_refactor to 7c439fe
Date Mon, 29 Apr 2013 13:14:28 GMT
Merge branch 'master' into marvin_refactor

Conflicts:
	tools/marvin/marvin/cloudstackConnection.py
	tools/marvin/marvin/cloudstackTestClient.py
	ui/css/cloudstack3.css
	ui/scripts/system.js


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7c439fe6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7c439fe6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7c439fe6

Branch: refs/heads/marvin_refactor
Commit: 7c439fe6934eaba857cf8fb0c05ef5fce163e2e4
Parents: e89e4e7 766b36f
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Mon Apr 29 18:42:52 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Mon Apr 29 18:42:52 2013 +0530

----------------------------------------------------------------------
 agent/conf/agent.properties                        |    2 +-
 .../cloud/configuration/ConfigurationService.java  |   15 +-
 api/src/com/cloud/network/NetworkModel.java        |    2 +-
 .../api/command/admin/cluster/ListClustersCmd.java |    8 +-
 .../api/command/admin/config/ListCfgsByCmd.java    |   44 +-
 .../api/command/admin/config/UpdateCfgCmd.java     |   47 +-
 .../api/command/admin/host/ListHostsCmd.java       |    7 +
 .../api/command/admin/pod/ListPodsByCmd.java       |    7 +
 .../api/command/admin/router/ListRoutersCmd.java   |    7 +
 .../command/admin/systemvm/ListSystemVMsCmd.java   |    7 +
 .../api/command/user/iso/ListIsosCmd.java          |    7 +
 .../api/command/user/network/ListNetworksCmd.java  |    7 +
 .../command/user/snapshot/ListSnapshotsCmd.java    |    7 +
 .../command/user/template/ListTemplatesCmd.java    |    8 +
 .../api/command/user/zone/ListZonesByCmd.java      |    8 +
 .../api/response/ConfigurationResponse.java        |    3 +
 .../WEB-INF/classes/resources/messages.properties  |   11 +-
 client/pom.xml                                     |   11 +-
 client/tomcatconf/applicationContext.xml.in        |    4 +
 core/src/com/cloud/async/AsyncJobVO.java           |    1 +
 docs/en-US/added-API-commands-4.2.xml              |   24 +
 docs/en-US/delete-event-alerts.xml                 |   12 +
 docs/en-US/events.xml                              |    2 +-
 docs/en-US/images/eip-ns-basiczone.png             |  Bin 0 -> 55568 bytes
 packaging/centos63/package.sh                      |    4 +-
 .../debian/config/etc/init.d/cloud-early-config    |    8 +
 server/src/com/cloud/alert/AlertManagerImpl.java   |   27 +-
 server/src/com/cloud/api/ApiDBUtils.java           |    2 +-
 .../src/com/cloud/api/query/QueryManagerImpl.java  |   21 +-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java    |    6 +-
 .../api/query/dao/DomainRouterJoinDaoImpl.java     |    6 +-
 .../com/cloud/api/query/dao/HostJoinDaoImpl.java   |    6 +-
 .../api/query/dao/SecurityGroupJoinDaoImpl.java    |    6 +-
 .../api/query/dao/StoragePoolJoinDaoImpl.java      |    6 +-
 .../api/query/dao/UserAccountJoinDaoImpl.java      |    6 +-
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |    6 +-
 .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java |    6 +-
 .../src/com/cloud/api/query/vo/AccountJoinVO.java  |    6 +-
 .../com/cloud/api/query/vo/DomainRouterJoinVO.java |    6 +-
 server/src/com/cloud/api/query/vo/HostJoinVO.java  |    6 +-
 .../cloud/api/query/vo/SecurityGroupJoinVO.java    |    6 +-
 .../com/cloud/api/query/vo/StoragePoolJoinVO.java  |    6 +-
 .../com/cloud/api/query/vo/UserAccountJoinVO.java  |    6 +-
 .../src/com/cloud/api/query/vo/UserVmJoinVO.java   |    6 +-
 .../src/com/cloud/api/query/vo/VolumeJoinVO.java   |    6 +-
 server/src/com/cloud/capacity/dao/CapacityDao.java |    2 +-
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |   35 +-
 server/src/com/cloud/configuration/Config.java     |   20 +-
 .../cloud/configuration/ConfigurationManager.java  |    2 +-
 .../configuration/ConfigurationManagerImpl.java    |  173 +-
 server/src/com/cloud/deploy/FirstFitPlanner.java   |   25 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |    7 +-
 server/src/com/cloud/network/NetworkModelImpl.java |   11 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |   19 +-
 .../network/firewall/FirewallManagerImpl.java      |   12 +-
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |    2 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |    6 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |   11 +-
 .../src/com/cloud/server/ManagementServerImpl.java |  153 +-
 .../storage/dao/StoragePoolDetailsDaoImpl.java     |    1 +
 .../src/com/cloud/storage/dao/VMTemplateDao.java   |    2 +-
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |   11 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |   32 +-
 .../com/cloud/template/TemplateAdapterBase.java    |    7 +-
 .../com/cloud/template/TemplateManagerImpl.java    |   10 +-
 .../upgrade/PremiumDatabaseUpgradeChecker.java     |   75 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   11 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |    2 +
 .../com/cloud/network/MockNetworkModelImpl.java    |    2 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    8 +-
 .../test/com/cloud/vpc/MockNetworkModelImpl.java   |    2 +-
 .../affinity/AffinityApiTestConfiguration.java     |   29 +-
 .../networkoffering/ChildTestConfiguration.java    |   38 +-
 setup/db/db/schema-410to420.sql                    |    4 +
 .../component/test_multiple_ip_ranges.py           |  238 ++
 test/integration/component/test_vpn_users.py       |  447 ++++
 test/integration/smoke/test_global_settings.py     |   14 +-
 ui/css/cloudstack3.css                             |   83 +-
 ui/dictionary.jsp                                  | 1710 +++++++--------
 ui/images/icons.png                                |  Bin 50745 -> 50052 bytes
 ui/images/sprites.png                              |  Bin 188552 -> 192407 bytes
 ui/index.jsp                                       |   19 +-
 ui/scripts/affinity.js                             |  183 ++
 ui/scripts/cloudStack.js                           |    9 +-
 ui/scripts/domains.js                              |    2 +-
 ui/scripts/instanceWizard.js                       |  941 ++++----
 ui/scripts/instances.js                            |  151 ++-
 ui/scripts/regions.js                              |   27 +-
 ui/scripts/sharedFunctions.js                      |    4 +
 ui/scripts/system.js                               |  283 ++-
 ui/scripts/ui-custom/affinity.js                   |  173 ++
 ui/scripts/ui-custom/instanceWizard.js             |   19 +
 ui/scripts/ui/widgets/detailView.js                |   29 +-
 ui/scripts/ui/widgets/listView.js                  |   10 +-
 94 files changed, 3666 insertions(+), 1797 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c439fe6/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c439fe6/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c439fe6/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c439fe6/ui/scripts/instances.js
----------------------------------------------------------------------


Mime
View raw message